[Hotfix] Fix HP_EVENT regression (#2927)

* [Hotfix] Fix HP_EVENT regression

* Update mob.cpp
This commit is contained in:
Chris Miles 2023-02-13 22:28:40 -06:00 committed by GitHub
parent 02302802b8
commit 064ae7ba89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1378,25 +1378,23 @@ void Mob::CreateHPPacket(EQApplicationPacket* app)
ds->hp = (int)GetHPRatio(); ds->hp = (int)GetHPRatio();
// hp event // hp event
if (IsNPC() && (GetNextHPEvent() > 0)) if (IsNPC() && (GetNextHPEvent() > 0)) {
{ if (ds->hp < GetNextHPEvent()) {
if (ds->hp < GetNextHPEvent()) std::string export_string = fmt::format("{}", GetNextHPEvent());
{
if (parse->HasQuestSub(CastToNPC()->GetNPCTypeID(), EVENT_HP)) {
parse->EventNPC(EVENT_HP, CastToNPC(), nullptr, std::to_string(GetNextHPEvent()), 0);
}
SetNextHPEvent(-1); SetNextHPEvent(-1);
if (parse->HasQuestSub(CastToNPC()->GetNPCTypeID(), EVENT_HP)) {
parse->EventNPC(EVENT_HP, CastToNPC(), nullptr, export_string, 0);
}
} }
} }
if (IsNPC() && (GetNextIncHPEvent() > 0)) if (IsNPC() && (GetNextIncHPEvent() > 0)) {
{ if (ds->hp > GetNextIncHPEvent()) {
if (ds->hp > GetNextIncHPEvent()) std::string export_string = fmt::format("{}", GetNextIncHPEvent());
{
if (parse->HasQuestSub(CastToNPC()->GetNPCTypeID(), EVENT_HP)) {
parse->EventNPC(EVENT_HP, CastToNPC(), nullptr, std::to_string(GetNextIncHPEvent()), 1);
}
SetNextIncHPEvent(-1); SetNextIncHPEvent(-1);
if (parse->HasQuestSub(CastToNPC()->GetNPCTypeID(), EVENT_HP)) {
parse->EventNPC(EVENT_HP, CastToNPC(), nullptr, export_string, 1);
}
} }
} }
} }