Fix players unable to join during battle

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index e5dc5e5d48503e38daee9edfdae391071472ce67..beb775d01b9cb65854358df58577e1133eeb7b23 100644 (file)
--- 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 da9d0f36c7c5e091320b94947f47f849972d8fff..90b376884f60787a16f62c740215c9cd22f953d7 100644 (file)
--- 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 bb5df89cad6665f3753382fe4f67012dc67f69ec..38747a3661400a586b0d17bd52c42414ce108e96 100644 (file)
--- 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);