From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 11 Dec 2010 20:02:08 +0000 (+0100)
Subject: move the antispam to a better place :P
X-Git-Tag: xonotic-v0.1.0preview~55
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b76feab34c3808e0d7c65f8a6d008306b774263e;p=xonotic%2Fxonotic-data.pk3dir.git

move the antispam to a better place :P
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 821f51573..d1720a4d4 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1306,16 +1306,16 @@ void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto, -2
 	if(g_race_qualifying)
 		killtime = 0;
 
-	if(self.modelindex && self.deadflag == DEAD_NO)
-	{
-		killtime = max(killtime, self.clientkill_nexttime - time);
-		self.clientkill_nexttime = time + killtime + autocvar_g_balance_kill_antispam;
-	}
-
 	self.killindicator_teamchange = targetteam;
 
 	if(!self.killindicator)
 	{
+		if(self.modelindex && self.deadflag == DEAD_NO)
+		{
+			killtime = max(killtime, self.clientkill_nexttime - time);
+			self.clientkill_nexttime = time + killtime + autocvar_g_balance_kill_antispam;
+		}
+
 		if(killtime <= 0 || !self.modelindex || self.deadflag != DEAD_NO)
 		{
 			ClientKill_Now();