From 1123099a30f8f04b1abc40af23888aded1a4d904 Mon Sep 17 00:00:00 2001 From: terencehill Date: Mon, 4 Jun 2018 16:59:12 +0200 Subject: [PATCH] Clan Arena: fix team selection dialog displayed once more after a player dies for the first time --- qcsrc/server/client.qc | 2 +- qcsrc/server/mutators/mutator/gamemode_ca.qc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index 97c4cce5a..06aac36e7 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -2151,8 +2151,8 @@ bool joinAllowed(entity this) if (CS(this).version_mismatch) return false; if (!nJoinAllowed(this, this)) return false; if (teamplay && lockteams) return false; - if (ShowTeamSelection(this)) return false; if (MUTATOR_CALLHOOK(ForbidSpawn, this)) return false; + if (ShowTeamSelection(this)) return false; return true; } diff --git a/qcsrc/server/mutators/mutator/gamemode_ca.qc b/qcsrc/server/mutators/mutator/gamemode_ca.qc index 49bd58bd8..176661ac9 100644 --- a/qcsrc/server/mutators/mutator/gamemode_ca.qc +++ b/qcsrc/server/mutators/mutator/gamemode_ca.qc @@ -268,7 +268,7 @@ MUTATOR_HOOKFUNCTION(ca, PlayerDies) if (!allowed_to_spawn) { frag_target.respawn_flags = RESPAWN_SILENT; - // prevent unwanted sudden rejoin as spectator and move of spectator camera + // prevent unwanted sudden rejoin as spectator and movement of spectator camera frag_target.respawn_time = time + 2; } frag_target.respawn_flags |= RESPAWN_FORCE; -- 2.39.2