From: z411 <z411@omaera.org>
Date: Sun, 28 May 2023 19:27:14 +0000 (-0400)
Subject: Join queued player later
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=656b3243278e2fba440d8915c193111d5e7ebc67;p=xonotic%2Fxonotic-data.pk3dir.git

Join queued player later
---

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 5e4c5eaa3..b5899c2cf 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -1984,10 +1984,7 @@ void Join(entity this)
 
 	entity queued_join = SpectatorWantsJoin(this);
 	if(queued_join)
-	{
-		Join(queued_join);
 		this.team_selected = false; // Don't let this player select team
-	}
 
 	if(!this.team_selected)
 	if(autocvar_g_campaign || autocvar_g_balance_teams || queued_join)
@@ -2010,6 +2007,9 @@ void Join(entity this)
 		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_JOIN_PLAY, this.netname);
 	this.team_selected = false;
 	this.wants_join = 0;
+
+	if(queued_join)
+		Join(queued_join);
 }
 
 int GetPlayerLimit()