ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(Core/Crash): Evade after cleaning threat references. (#8160)

Browse source
This commit is contained in:
UltraNix 2021-10-06 06:26:03 +02:00 • committed by GitHub
parent 702573038e
commit 0d411ec2c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/server/game/Combat/HostileRefMgr.cpp
View file

@ -113,6 +113,8 @@ void HostileRefMgr::updateThreatTables()
void HostileRefMgr::deleteReferences(bool removeFromMap /*= false*/)
{
std::vector<Creature*> creaturesToEvade;
HostileReference* ref = getFirst();
while (ref)
{
@ -127,7 +129,7 @@ void HostileRefMgr::deleteReferences(bool removeFromMap /*= false*/)
{
if (Creature* creature = threatMgr->GetOwner()->ToCreature())
{
creature->AI()->EnterEvadeMode();
creaturesToEvade.push_back(creature);
}
}
}
@ -136,6 +138,11 @@ void HostileRefMgr::deleteReferences(bool removeFromMap /*= false*/)
delete ref;
ref = nextRef;
}
for (Creature* creature : creaturesToEvade)
{
creature->AI()->EnterEvadeMode();
}
}
//=================================================

2
src/server/game/Entities/Unit/Unit.cpp
View file

@ -14812,7 +14812,7 @@ void Unit::CleanupBeforeRemoveFromMap(bool finalCleanup)
CombatStop();
ClearComboPointHolders();
DeleteThreatList();
getHostileRefMgr().deleteReferences(true);
getHostileRefMgr().deleteReferences();
GetMotionMaster()->Clear(false); // remove different non-standard movement generators.
}