From d0e30ec97abee8b2da5ce1ec18da5bed3babb31d Mon Sep 17 00:00:00 2001 From: terencehill Date: Mon, 25 May 2020 23:55:37 +0200 Subject: [PATCH 1/1] Fix impossibility of joining an LMS game introduced by b609dc6 "Don't log frags and damage while round hasn't started yet (telefrags, lava, trigger_hurt)". This new implementation of b609dc6 restores the logging of frags --- qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc | 3 +++ qcsrc/server/scores.qc | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc index 408a14e0d8..73d127bd40 100644 --- a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc +++ b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc @@ -377,6 +377,9 @@ MUTATOR_HOOKFUNCTION(ca, FilterItem) MUTATOR_HOOKFUNCTION(ca, PlayerDamage_SplitHealthArmor) { + if (time < game_starttime || (round_handler_IsActive() && !round_handler_IsRoundStarted())) + return; + entity frag_attacker = M_ARGV(1, entity); entity frag_target = M_ARGV(2, entity); float frag_damage = M_ARGV(7, float); diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc index 69b18ba2a2..12175bb764 100644 --- a/qcsrc/server/scores.qc +++ b/qcsrc/server/scores.qc @@ -108,8 +108,7 @@ float TeamScore_AddToTeam(int t, float scorefield, float score) { entity s; - if(game_stopped || time < game_starttime - || (round_handler_IsActive() && !round_handler_IsRoundStarted())) + if(game_stopped) { score = 0; } @@ -338,8 +337,7 @@ float PlayerScore_Add(entity player, PlayerScoreField scorefield, float score) bool mutator_returnvalue = MUTATOR_CALLHOOK(AddPlayerScore, scorefield, score, player); score = M_ARGV(1, float); - if((!mutator_returnvalue && game_stopped) || time < game_starttime - || (round_handler_IsActive() && !round_handler_IsRoundStarted())) + if(!mutator_returnvalue && game_stopped) { score = 0; } -- 2.39.2