From: FruitieX <fruitiex@gmail.com>
Date: Thu, 25 Nov 2010 14:10:14 +0000 (+0200)
Subject: only add a new ice block if there isn't an old one, this way other code doesn't worry... 
X-Git-Tag: xonotic-v0.1.0preview~86^2~2^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=649ea9e803110ee25ba173a99db9818b7ec484d7;p=xonotic%2Fxonotic-data.pk3dir.git

only add a new ice block if there isn't an old one, this way other code doesn't worry about this happening
---

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 829290163..4802d6db2 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -626,12 +626,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 		MUTATOR_CALLHOOK(PlayerDies);
 
 		if(g_freezetag)
-        {
-            if(deathtype != DEATH_KILL || attacker == self)
-                return;
-            else // team change or kill trigger
-                freezetag_Unfreeze(); // remove all ice blocks 
-        }
+            return;
 
 		if(self.flagcarried)
 		{
diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc
index 4da6f2036..8df04eace 100644
--- a/qcsrc/server/mutators/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/gamemode_freezetag.qc
@@ -134,9 +134,9 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerDies)
 		else if(self.team == COLOR_TEAM4)
 			--pinkalive;
 		--totalalive;
-	}
 
-	freezetag_Freeze();
+        freezetag_Freeze();
+	}
 
 	centerprint(frag_attacker, strcat("^2You froze ^7", frag_target.netname, ".\n"));
 	if(frag_attacker == frag_target || frag_attacker == world)