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

diff --cc qcsrc/server/cl_client.qc
index 6ac29a7f83d1af4ae2878d08f85e08d9a41252b0,d1720a4d4cfc4728c58995d35c044ca07c002adb..fac1c0e57111079104c270b3f7201c0d2ae66694
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -1308,19 -1303,19 +1308,19 @@@ void ClientKill_TeamChange (float targe
        entity e;
        killtime = autocvar_g_balance_kill_delay;
  
 -      if(g_race_qualifying)
 +      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.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();