[Hotfix] Fix issue with EVENT_HP firing regression from #2904 (#2924)

* [Hotfix] Fix issue with EVENT_HP firing from #2904 * Fix * Fix
EQEmu · Feb 14, 2023 · 5b56a23 · 5b56a23
1 parent 97edb09
commit 5b56a23
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/zone/mob.cpp b/zone/mob.cpp
@@ -1382,23 +1382,21 @@ void Mob::CreateHPPacket(EQApplicationPacket* app)
 	{
 		if (ds->hp < GetNextHPEvent())
 		{
-			SetNextHPEvent(-1);
-
-			if (parse->HasQuestSub(GetNPCTypeID(), EVENT_HP)) {
+			if (parse->HasQuestSub(CastToNPC()->GetNPCTypeID(), EVENT_HP)) {
 				parse->EventNPC(EVENT_HP, CastToNPC(), nullptr, std::to_string(GetNextHPEvent()), 0);
 			}
+			SetNextHPEvent(-1);
 		}
 	}
 
 	if (IsNPC() && (GetNextIncHPEvent() > 0))
 	{
 		if (ds->hp > GetNextIncHPEvent())
 		{
-			SetNextIncHPEvent(-1);
-
-			if (parse->HasQuestSub(GetNPCTypeID(), EVENT_HP)) {
+			if (parse->HasQuestSub(CastToNPC()->GetNPCTypeID(), EVENT_HP)) {
 				parse->EventNPC(EVENT_HP, CastToNPC(), nullptr, std::to_string(GetNextIncHPEvent()), 1);
 			}
+			SetNextIncHPEvent(-1);
 		}
 	}
 }