From 4c77122e4c6d34c92c6e0ad379f802ff2fa3136b Mon Sep 17 00:00:00 2001 From: terencehill Date: Sat, 2 Mar 2013 14:09:57 +0100 Subject: [PATCH] When manually moving to spectators reset caplayer in the mutator hook MakePlayerObserver --- qcsrc/server/cl_client.qc | 3 +-- qcsrc/server/mutators/gamemode_ca.qc | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index a32fd6a123..8c922b2b28 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 0b47a2dd52..15ed4fa711 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; -- 2.39.2