Merge branch 'master' into martin-t/mg-solidpen

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

diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
index d25d963facc979e977d11dbed0b1e6aa2bbfa9c8..5ff2d3472ae22ebbf2d3d898e0ecbd5f4ae4c910 100644 (file)
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -1322,7 +1322,13 @@ void GameCommand_shuffleteams(int request)
        {
                case CMD_REQUEST_COMMAND:
                {
-                       shuffleteams();
+                       if (shuffleteams_on_reset_map)
+                       {
+                               bprint("Players will be shuffled when this round is over.\n");
+                               shuffleteams_on_reset_map = true;
+                       }
+                       else
+                               shuffleteams();
                        return;
                }