From: terencehill <piuntn@gmail.com>
Date: Fri, 24 Jan 2014 19:21:24 +0000 (+0100)
Subject: When a CA player is spectating but still in game, on command join don't even try... 
X-Git-Tag: xonotic-v0.8.0~126^2~24
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=935f830afc67c1b7fefe3170fc2c4aef9ac1a4c8;p=xonotic%2Fxonotic-data.pk3dir.git

When a CA player is spectating but still in game, on command join don't even try to check if join is allowed
---

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index e68cf8bfa..5de404e31 100644
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -152,6 +152,8 @@ void ClientCommand_join(float request)
 			{
 				if(!IS_PLAYER(self) && !lockteams)
 				{
+					if(self.caplayer)
+						return;
 					if(nJoinAllowed(self))
 					{
 						if(autocvar_g_campaign) { campaign_bots_may_start = 1; }