From: Mario <mario.mario@y7mail.com>
Date: Fri, 17 Apr 2020 12:22:49 +0000 (+1000)
Subject: Check joinAllowed again before actually joining, fixes race conditions where players... 
X-Git-Tag: xonotic-v0.8.5~1108
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=607abab23817823d3037a5cda3f2d011e9c444b1;p=xonotic%2Fxonotic-data.pk3dir.git

Check joinAllowed again before actually joining, fixes race conditions where players can bypass the player limit
---

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 271c80396..1ded3b3d4 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -2271,7 +2271,8 @@ void ObserverThink(entity this)
 			if(this.flags & FL_SPAWNING)
 			{
 				this.flags &= ~FL_SPAWNING;
-				Join(this);
+				if(joinAllowed(this))
+					Join(this);
 				return;
 			}
 		}