From: z411 <z411@omaera.org>
Date: Wed, 31 May 2023 23:37:34 +0000 (-0400)
Subject: Disable team queue on campaign
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=03f9dcbbdbdffb7c6e163cf1ff9de657a5443bd0;p=xonotic%2Fxonotic-data.pk3dir.git

Disable team queue on campaign
---

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index bc9a2652c..140d52624 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -236,7 +236,7 @@ bool Player_SetTeamIndex(entity player, int index)
 
 bool IsQueueNeeded(entity ignore)
 {
-	return (teamplay && autocvar_g_balance_teams_queue && AVAILABLE_TEAMS == 2 && TeamBalance_AreEqual(ignore));
+	return (teamplay && autocvar_g_balance_teams_queue && !autocvar_g_campaign && AVAILABLE_TEAMS == 2 && TeamBalance_AreEqual(ignore));
 }
 
 entity SpectatorWantsJoin(entity this)
@@ -717,7 +717,7 @@ bool TeamBalance_AreEqual(entity ignore)
 
 void TeamBalance_RemoveExcessPlayers(entity ignore)
 {
-	if(AVAILABLE_TEAMS != 2) return;
+	if(AVAILABLE_TEAMS != 2 || autocvar_g_campaign) return;
 
 	entity balance = TeamBalance_CheckAllowedTeams(ignore);
 	TeamBalance_GetTeamCounts(balance, ignore);