move the antispam to a better place :P
authorRudolf Polzer <divverent@alientrap.org>
Sat, 11 Dec 2010 20:02:08 +0000 (21:02 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 11 Dec 2010 20:02:08 +0000 (21:02 +0100)
qcsrc/server/cl_client.qc

index 821f515..d1720a4 100644 (file)
@@ -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();