Merge remote branch 'origin/master' into fruitiex/ctsfix

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 6ac29a7f83d1af4ae2878d08f85e08d9a41252b0..fac1c0e57111079104c270b3f7201c0d2ae66694 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1311,16 +1311,16 @@ void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto, -2
        if(g_race_qualifying || g_cts)
                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();