From 064ae7ba89c3f839f7d817edbcc9ec5af96f5cec Mon Sep 17 00:00:00 2001 From: Chris Miles Date: Mon, 13 Feb 2023 22:28:40 -0600 Subject: [PATCH] [Hotfix] Fix HP_EVENT regression (#2927) * [Hotfix] Fix HP_EVENT regression * Update mob.cpp --- zone/mob.cpp | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/zone/mob.cpp b/zone/mob.cpp index b5f03a5fd..9795feabf 100644 --- a/zone/mob.cpp +++ b/zone/mob.cpp @@ -1378,25 +1378,23 @@ void Mob::CreateHPPacket(EQApplicationPacket* app) ds->hp = (int)GetHPRatio(); // hp event - if (IsNPC() && (GetNextHPEvent() > 0)) - { - if (ds->hp < GetNextHPEvent()) - { - if (parse->HasQuestSub(CastToNPC()->GetNPCTypeID(), EVENT_HP)) { - parse->EventNPC(EVENT_HP, CastToNPC(), nullptr, std::to_string(GetNextHPEvent()), 0); - } + if (IsNPC() && (GetNextHPEvent() > 0)) { + if (ds->hp < GetNextHPEvent()) { + std::string export_string = fmt::format("{}", GetNextHPEvent()); SetNextHPEvent(-1); + if (parse->HasQuestSub(CastToNPC()->GetNPCTypeID(), EVENT_HP)) { + parse->EventNPC(EVENT_HP, CastToNPC(), nullptr, export_string, 0); + } } } - if (IsNPC() && (GetNextIncHPEvent() > 0)) - { - if (ds->hp > GetNextIncHPEvent()) - { - if (parse->HasQuestSub(CastToNPC()->GetNPCTypeID(), EVENT_HP)) { - parse->EventNPC(EVENT_HP, CastToNPC(), nullptr, std::to_string(GetNextIncHPEvent()), 1); - } + if (IsNPC() && (GetNextIncHPEvent() > 0)) { + if (ds->hp > GetNextIncHPEvent()) { + std::string export_string = fmt::format("{}", GetNextIncHPEvent()); SetNextIncHPEvent(-1); + if (parse->HasQuestSub(CastToNPC()->GetNPCTypeID(), EVENT_HP)) { + parse->EventNPC(EVENT_HP, CastToNPC(), nullptr, export_string, 1); + } } } }