From: terencehill <piuntn@gmail.com>
Date: Sat, 2 Mar 2013 13:09:57 +0000 (+0100)
Subject: When manually moving to spectators reset caplayer in the mutator hook MakePlayerObserver
X-Git-Tag: xonotic-v0.7.0~61^2~36
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4c77122e4c6d34c92c6e0ad379f802ff2fa3136b;p=xonotic%2Fxonotic-data.pk3dir.git

When manually moving to spectators reset caplayer in the mutator hook MakePlayerObserver
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index a32fd6a12..8c922b2b2 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1046,14 +1046,13 @@ void ClientKill_Now_TeamChange()
 	}
 	else if(self.killindicator_teamchange == -2)
 	{
-		if(g_ca)
-			self.caplayer = 0;
 		if(blockSpectators)
 			sprint(self, strcat("^7You have to become a player within the next ", ftos(autocvar_g_maxplayers_spectator_blocktime), " seconds, otherwise you will be kicked, because spectators aren't allowed at this time!\n"));
 		PutObserverInServer();
 	}
 	else
 		SV_ChangeTeam(self.killindicator_teamchange - 1);
+	self.killindicator_teamchange = 0;
 }
 
 void ClientKill_Now()
diff --git a/qcsrc/server/mutators/gamemode_ca.qc b/qcsrc/server/mutators/gamemode_ca.qc
index 0b47a2dd5..15ed4fa71 100644
--- a/qcsrc/server/mutators/gamemode_ca.qc
+++ b/qcsrc/server/mutators/gamemode_ca.qc
@@ -216,6 +216,8 @@ MUTATOR_HOOKFUNCTION(ca_ForbidPlayerScore_Clear)
 
 MUTATOR_HOOKFUNCTION(ca_MakePlayerObserver)
 {
+	if(self.killindicator_teamchange == -2)
+		self.caplayer = 0;
 	if(self.caplayer)
 		self.frags = FRAGS_LMS_LOSER;
 	return 1;