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

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/server/autocvars.qh
Simple merge

diff --cc qcsrc/server/cl_client.qc
index fbe98741f20ea684e2a638a1368fb4110436023d,821f51573d9c01c6892d4b713e58cbd5db2fb666..274d5ccdb3a5863ae905184d330338b8d731b0d3
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -1300,18 -1306,15 +1311,24 @@@ void ClientKill_TeamChange (float targe
        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(g_cts) // allow an instant kill in CTS
 +    {
 +        if(self.selfkilltime < time + 3) // prevent spam
 +        {
 +            self.selfkilltime = max(time, self.selfkilltime) + 2;
 +            ClientKill_Now();
 +        }
 +        return;
 +    }
 +    if(!self.killindicator)
        {
                if(killtime <= 0 || !self.modelindex || self.deadflag != DEAD_NO)
                {

diff --cc qcsrc/server/miscfunctions.qc
Simple merge