]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Don't log (indirect) damage dealt to frozen players
authorterencehill <piuntn@gmail.com>
Mon, 15 Jun 2020 14:08:24 +0000 (16:08 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 15 Jun 2020 14:08:24 +0000 (16:08 +0200)
qcsrc/server/player.qc

index d9def3977b3675968630e65f901287d966893d00..0741d4156eeed381aefc78963ecabac94c66e0ff 100644 (file)
@@ -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);