From bb372b938915897588166427301cce8ea4be44d3 Mon Sep 17 00:00:00 2001 From: fgsfds Date: Thu, 27 Feb 2020 21:11:47 +0300 Subject: [PATCH] don't hit monsters on the client when it's warmup time --- src/game/g_weapons.pas | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas index 3949fe9..498487d 100644 --- a/src/game/g_weapons.pas +++ b/src/game/g_weapons.pas @@ -461,12 +461,12 @@ begin if (t <> HIT_FLAME) or (m.FFireTime = 0) or (vx <> 0) or (vy <> 0) then Result := m.Damage(d, vx, vy, SpawnerUID, t) else - Result := True; + Result := (gLMSRespawn <> LMS_RESPAWN_WARMUP); // don't hit monsters when it's warmup time if t = HIT_FLAME then m.CatchFire(SpawnerUID); end else - Result := True; + Result := (gLMSRespawn <> LMS_RESPAWN_WARMUP); // don't hit monsters when it's warmup time end; -- 2.29.2