From 906b8f46343ca25aaab3400687421707f309f114 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sun, 18 May 2025 20:21:42 +0200 Subject: [PATCH] Don't apply the Burning effect if fire inflicts no damage; it prevents a bug where player or vehicle starts burning permanently if hit by a teammate with a high firerate weapon such as the machine gun secondary attack --- qcsrc/server/damage.qc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qcsrc/server/damage.qc b/qcsrc/server/damage.qc index fac8bb731a..024f7b141a 100644 --- a/qcsrc/server/damage.qc +++ b/qcsrc/server/damage.qc @@ -999,9 +999,11 @@ bool Heal(entity targ, entity inflictor, float amount, float limit) float Fire_AddDamage(entity e, entity o, float d, float t, float dt) { - float dps; float maxtime, mintime, maxdamage, mindamage, maxdps, mindps, totaldamage, totaltime; + if (d <= 0) + return -1; + if(IS_PLAYER(e)) { if(IS_DEAD(e)) @@ -1009,7 +1011,7 @@ float Fire_AddDamage(entity e, entity o, float d, float t, float dt) } t = max(t, 0.1); - dps = d / t; + float dps = d / t; if(StatusEffects_active(STATUSEFFECT_Burning, e)) { float fireendtime = StatusEffects_gettime(STATUSEFFECT_Burning, e); -- 2.39.5