From: terencehill <piuntn@gmail.com>
Date: Tue, 26 Feb 2019 17:11:16 +0000 (+0100)
Subject: Don't play any pain sound when hitting a frozen player (it happened while revive... 
X-Git-Tag: xonotic-v0.8.5~688^2~14
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=429a67d;p=xonotic%2Fxonotic-data.pk3dir.git

Don't play any pain sound when hitting a frozen player (it happened while revive progress is on)
---

diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc
index b8d3c903c..81c63f21c 100644
--- a/qcsrc/server/player.qc
+++ b/qcsrc/server/player.qc
@@ -412,7 +412,8 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 	if (take > 100)
 		Violence_GibSplash_At(hitloc, force * -0.2, 3, 1, this, attacker);
 
-	if (time >= this.spawnshieldtime || autocvar_g_spawnshield_blockdamage < 1)
+	if ((time >= this.spawnshieldtime || autocvar_g_spawnshield_blockdamage < 1)
+		&& !STAT(FROZEN, this))
 	{
 		if (!(this.flags & FL_GODMODE))
 		{