From 1e56a16ecb366fda01ed8a543bdd3a5bee08f694 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 26 Jun 2018 22:15:04 +1000 Subject: [PATCH] Don't count dmg score if player has spawn shield or godmode --- qcsrc/server/player.qc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc index cc58cdc6d7..5bd4b59894 100644 --- a/qcsrc/server/player.qc +++ b/qcsrc/server/player.qc @@ -462,6 +462,16 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, this.v_angle_y = this.v_angle.y + (random() * 2 - 1) * shake; this.v_angle_x = bound(-90, this.v_angle.x, 90); } + + if (this != attacker) { + float realdmg = damage - excess; + if (IS_PLAYER(attacker)) { + GameRules_scoring_add(attacker, DMG, realdmg); + } + if (IS_PLAYER(this)) { + GameRules_scoring_add(this, DMGTAKEN, realdmg); + } + } } else this.max_armorvalue += (save + take); @@ -470,16 +480,6 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, this.dmg_take = this.dmg_take + take;//max(take - 10, 0); this.dmg_inflictor = inflictor; - if (this != attacker) { - float realdmg = damage - excess; - if (IS_PLAYER(attacker)) { - GameRules_scoring_add(attacker, DMG, realdmg); - } - if (IS_PLAYER(this)) { - GameRules_scoring_add(this, DMGTAKEN, realdmg); - } - } - bool abot = (IS_BOT_CLIENT(attacker)); bool vbot = (IS_BOT_CLIENT(this)); -- 2.39.2