Disabled team queue by default and whitelisted

diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc
index a4b69e24704257b31fdd051355428524b63836dc..21bd4139f670a22350d05944f8d4def2e53b8626 100644 (file)
--- a/qcsrc/server/world.qc
+++ b/qcsrc/server/world.qc
@@ -450,6 +450,8 @@ void cvar_changes_init()
                BADCVAR("gametype");
                BADCVAR("g_antilag");
                BADCVAR("g_balance_teams");
+               BADCVAR("g_balance_teams_queue");
+               BADCVAR("g_balance_teams_remove");
                BADCVAR("g_balance_teams_prevent_imbalance");
                BADCVAR("g_balance_teams_scorefactor");
                BADCVAR("g_ban_sync_trusted_servers");

diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index db7f3595a9dfe184b15cb23db1babfc48238b525..bc81ec6ed6122d65682dae748827ab3b10894ab7 100644 (file)
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -277,8 +277,8 @@ set g_teamdamage_resetspeed 20      "for teamplay_mode 4: how fast player's team
 
 set g_balance_teams 1 "automatically balance out players entering instead of asking them for their preferred team"
 set g_balance_teams_prevent_imbalance 1 "prevent players from changing to larger teams"
-set g_balance_teams_queue 1 "queue players before joining"
-set g_balance_teams_remove 1 "remove excess players from teams"
+set g_balance_teams_queue 0 "queue players before joining"
+set g_balance_teams_remove 0 "remove excess players from teams"
 set g_changeteam_banned 0 "not allowed to change team"
 
 set sv_teamnagger 1 "enable a nag message when the teams are unbalanced"