Merge branch 'master' into martin-t/available

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / gamemodes / gamemode / clanarena / sv_clanarena.qc

diff --git a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
index 95f760c47c53a8316293ef35cf7ef9e50393286e..4721cb38015ea7cb4ea306accd3f3389eaa14d14 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
+++ b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
@@ -500,3 +500,11 @@ MUTATOR_HOOKFUNCTION(ca, SetWeaponArena)
        if (M_ARGV(0, string) == "0" || M_ARGV(0, string) == "")
                M_ARGV(0, string) = autocvar_g_ca_weaponarena;
 }
+
+MUTATOR_HOOKFUNCTION(ca, SV_ParseServerCommand)
+{
+       string cmd_name = M_ARGV(0, string);
+       if (cmd_name == "shuffleteams")
+               shuffleteams_on_reset_map = !allowed_to_spawn;
+       return false;
+}