Merge branch 'master' into Lyberta/TeamplayOverhaul

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

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 3faa2d8a83cb24f00ce0472359ee7e5859224e62..5b9ab4db5faf240bcc887d156f083359521a19c1 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -9,10 +9,10 @@
 
 #include "command/vote.qh"
 
-#include "mutators/_mod.qh"
+#include <server/mutators/_mod.qh>
 
 #include "../common/deathtypes/all.qh"
-#include "../common/gamemodes/_mod.qh"
+#include <common/gamemodes/_mod.qh>
 #include "../common/teams.qh"
 
 /// \brief Describes a state of team balance entity.
@@ -185,7 +185,11 @@ bool Player_SetTeamIndex(entity player, int index)
                // Mutator has blocked team change.
                return false;
        }
-       if (new_team != -1)
+       if (new_team == -1)
+       {
+               player.team = -1;
+       }
+       else
        {
                SetPlayerColors(player, new_team - 1);
        }