Techwizz/EQ2EMu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #558 - deadlock on heal checking encounter state of existing aggroed npcs on the person being healed

Browse source
This commit is contained in:
Emagi 2024-03-04 08:41:02 -05:00
parent 8f35ab39d7
commit 39ac029ffc
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
EQ2/source/WorldServer/Combat.cpp
View file

@ -696,14 +696,15 @@ bool Entity::SpellHeal(Spawn* target, float distance, LuaSpell* luaspell, string
int32 hate_amt = heal_amt / 2; int32 hate_amt = heal_amt / 2;
set<int32>::iterator itr; set<int32>::iterator itr;
((Entity*)target)->MHatedBy.lock(); ((Entity*)target)->MHatedBy.lock();
for (itr = ((Entity*)target)->HatedBy.begin(); itr != ((Entity*)target)->HatedBy.end(); itr++) { set<int32> hatedByCopy(((Entity*)target)->HatedBy);
((Entity*)target)->MHatedBy.unlock();
for (itr = hatedByCopy.begin(); itr != hatedByCopy.end(); itr++) {
Spawn* spawn = GetZone()->GetSpawnByID(*itr); Spawn* spawn = GetZone()->GetSpawnByID(*itr);
if (spawn && spawn->IsEntity() && target != this) { if (spawn && spawn->IsEntity() && target != this) {
CheckEncounterState((Entity*)spawn); CheckEncounterState((Entity*)spawn);
((Entity*)spawn)->AddHate(this, hate_amt); ((Entity*)spawn)->AddHate(this, hate_amt);
} }
} }
((Entity*)target)->MHatedBy.unlock();
} }
return true; return true;