Merge branch 'master' into Lyberta/TeamplayOverhaul2

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

diff --git a/qcsrc/server/clientkill.qc b/qcsrc/server/clientkill.qc
index 0bb761483b19bb8433c8bf968dad5fa3679b8f19..8d7293bb066214c1f5e47535be2ab93453f47c46 100644 (file)
--- a/qcsrc/server/clientkill.qc
+++ b/qcsrc/server/clientkill.qc
@@ -22,7 +22,10 @@ void ClientKill_Now_TeamChange(entity this)
                PutObserverInServer(this);
        }
        else
-               SV_ChangeTeam(this, this.killindicator_teamchange - 1);
+       {
+               Player_SetTeamIndexChecked(this, Team_TeamToIndex(
+                       this.killindicator_teamchange));
+       }
        this.killindicator_teamchange = 0;
 }