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

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_client.qc

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 51ab37a4c8b708cdcd82556c55c5b3379b3535da..76f81c8d7497080cc9ea3a3171631d42f824d859 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -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)
@@ -3030,7 +3035,7 @@ void PlayerPostThink (void)
        {
                if(!self.stored_netname)
                        self.stored_netname = strzone(uid2name(self.crypto_idfp));
-               if(self.stored_netname != self.stored_netname)
+               if(self.stored_netname != self.netname)
                {
                        db_put(ServerProgsDB, strcat("uid2name", self.crypto_idfp), self.netname);
                        strunzone(self.stored_netname);