From: terencehill Date: Mon, 15 Jun 2020 14:08:24 +0000 (+0200) Subject: Don't log (indirect) damage dealt to frozen players X-Git-Tag: xonotic-v0.8.5~688^2~4 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c9c6d2a7a420a9bdfea7a17e5c326ce568b6ba6b;p=xonotic%2Fxonotic-data.pk3dir.git Don't log (indirect) damage dealt to frozen players --- diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc index d9def3977..0741d4156 100644 --- a/qcsrc/server/player.qc +++ b/qcsrc/server/player.qc @@ -472,8 +472,8 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, } float realdmg = damage - excess; - if (this != attacker && realdmg) - if (!(round_handler_IsActive() && !round_handler_IsRoundStarted()) && time >= game_starttime) + if (this != attacker && realdmg && !STAT(FROZEN, this) + && (!(round_handler_IsActive() && !round_handler_IsRoundStarted()) && time >= game_starttime)) { if (IS_PLAYER(attacker) && DIFF_TEAM(attacker, this)) { GameRules_scoring_add(attacker, DMG, realdmg);