Merge remote branch 'origin/master' into fruitiex/racefixes
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_client.qc
index a5ec05c02fb6b75ac690f03a5b8663076d0e2e4d..76f81c8d7497080cc9ea3a3171631d42f824d859 100644 (file)
@@ -1305,7 +1305,12 @@ void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto
 
 void ClientKill (void)
 {
-       ClientKill_TeamChange(0);
+       if((g_arena || g_ca) && ((champion && champion.classname == "player" && player_count > 1) || player_count == 1)) // don't allow a kill in this case either
+       {
+               // do nothing
+       }
+       else
+               ClientKill_TeamChange(0);
 }
 
 void CTS_ClientKill_Think (void)