From: Mario <mario.mario@y7mail.com>
Date: Thu, 18 Apr 2013 10:06:57 +0000 (+1000)
Subject: Fix frozen players not dying/respawning if they touch a hurt trigger
X-Git-Tag: xonotic-v0.8.0~241^2^2~344
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=de6dbaf9b314e3686b8cef4105cc2c5a11241f72;p=xonotic%2Fxonotic-data.pk3dir.git

Fix frozen players not dying/respawning if they touch a hurt trigger
---

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 75401b0dd..2f25e5d2d 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -810,7 +810,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 			mirrorforce *= g_weaponforcefactor;
 		}
 		
-		if(targ.frozen && attacker.monsterid != MONSTER_SPIDER)
+		if(targ.frozen && attacker.monsterid != MONSTER_SPIDER && deathtype != DEATH_HURTTRIGGER)
 		{
 			damage = 0;
 			force *= 0.2;