From: Mario <mario.mario@y7mail.com>
Date: Sat, 26 Jan 2013 09:43:56 +0000 (+1100)
Subject: Fix players unable to join during battle
X-Git-Tag: xonotic-v0.8.0~241^2^2~563
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aba5ddce2b36b71cbd7d6f0bdf39b9cae573e6b0;p=xonotic%2Fxonotic-data.pk3dir.git

Fix players unable to join during battle
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index e5dc5e5d4..beb775d01 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2372,9 +2372,6 @@ float nJoinAllowed(entity ignore) {
 		if(autocvar_g_forced_team_otherwise == "spectator")
 			return 0;
 	}
-	
-	if(MUTATOR_CALLHOOK(PlayerCanJoin))
-		return 0;
 
 	if(self.team_forced < 0)
 		return 0; // forced spectators can never join
diff --git a/qcsrc/server/mutators/base.qh b/qcsrc/server/mutators/base.qh
index da9d0f36c..90b376884 100644
--- a/qcsrc/server/mutators/base.qh
+++ b/qcsrc/server/mutators/base.qh
@@ -50,10 +50,6 @@ MUTATOR_HOOKABLE(PlayerSpawn);
 
 MUTATOR_HOOKABLE(ClientDisconnect);
 	// called when a player disconnects
-	
-MUTATOR_HOOKABLE(PlayerCanJoin);
-	// called when a player tries to join
-	// if this returns TRUE, the player cannot join
 
 MUTATOR_HOOKABLE(PlayerDies);
 	// called when a player dies to e.g. remove stuff he was carrying.
diff --git a/qcsrc/server/mutators/gamemode_td.qc b/qcsrc/server/mutators/gamemode_td.qc
index bb5df89ca..38747a366 100644
--- a/qcsrc/server/mutators/gamemode_td.qc
+++ b/qcsrc/server/mutators/gamemode_td.qc
@@ -664,19 +664,6 @@ MUTATOR_HOOKFUNCTION(td_PlayerThink)
 	return FALSE;
 }
 
-MUTATOR_HOOKFUNCTION(td_PlayerCanJoin)
-{
-	entity player;
-	float n_players = 0;
-	
-	FOR_EACH_REALPLAYER(player) { if(clienttype(player) != CLIENTTYPE_BOT) n_players += 1; }
-	
-	if(current_phase == PHASE_COMBAT && n_players >= 1)
-		return TRUE;
-		
-	return FALSE;
-}
-
 MUTATOR_HOOKFUNCTION(td_PlayerSpawn)
 {
 	self.bot_attack = FALSE;
@@ -1050,7 +1037,6 @@ MUTATOR_DEFINITION(gamemode_td)
 	MUTATOR_HOOK(TurretValidateTarget, td_TurretValidateTarget, CBC_ORDER_ANY);
 	MUTATOR_HOOK(TurretSpawn, td_TurretSpawn, CBC_ORDER_ANY);
 	MUTATOR_HOOK(GiveFragsForKill, td_GiveFragsForKill, CBC_ORDER_ANY);
-	MUTATOR_HOOK(PlayerCanJoin, td_PlayerCanJoin, CBC_ORDER_ANY);
 	MUTATOR_HOOK(PlayerPreThink, td_PlayerThink, CBC_ORDER_ANY);
 	MUTATOR_HOOK(PlayerDies, td_PlayerDies, CBC_ORDER_ANY);
 	MUTATOR_HOOK(PlayerDamage_Calculate, td_PlayerDamage_Calculate, CBC_ORDER_ANY);