From 0bd1f5fb592a2d0574a6f6850b3961d85bdfd274 Mon Sep 17 00:00:00 2001 From: Blixibon Date: Tue, 11 May 2021 10:12:37 -0500 Subject: [PATCH] Fixed NPCs with death animations extinguishing their fires before they should be extinguished --- sp/src/game/server/EntityFlame.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sp/src/game/server/EntityFlame.cpp b/sp/src/game/server/EntityFlame.cpp index d3a1be10..80217efb 100644 --- a/sp/src/game/server/EntityFlame.cpp +++ b/sp/src/game/server/EntityFlame.cpp @@ -242,7 +242,12 @@ void CEntityFlame::FlameThink( void ) } CAI_BaseNPC *pNPC = m_hEntAttached->MyNPCPointer(); +#ifdef MAPBASE + // Don't extingish if the NPC is still dying + if ( pNPC && !pNPC->IsAlive() && pNPC->m_lifeState != LIFE_DYING ) +#else if ( pNPC && !pNPC->IsAlive() ) +#endif { UTIL_Remove( this ); // Notify the NPC that it's no longer burning!