From ad008c43b75080ec59aa973f1e2e4424332c34a4 Mon Sep 17 00:00:00 2001 From: xinef1 Date: Sat, 4 Feb 2017 22:37:16 +0100 Subject: Core/Misc: Fix various crashes, also related to multithreading (#19012) * When iterating groups we have to either do it not in multithreaded context (map updates) or start with checking maps (they are guaranteed to change in single thread update). * Properly clear ComboPoint references on player remove * remove some possible references item may have when it is deleted during save. * Also clear all hostile references when unit is removed from map. (cherrypicked from 86da1a19bb36edf3242dafac6e45e87434ddff73) --- src/server/game/Grids/ObjectGridLoader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/game/Grids/ObjectGridLoader.cpp') diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp index 01928bc5e01..6d1fb267d7f 100644 --- a/src/server/game/Grids/ObjectGridLoader.cpp +++ b/src/server/game/Grids/ObjectGridLoader.cpp @@ -221,7 +221,7 @@ void ObjectGridStoper::Visit(CreatureMapType &m) iter->GetSource()->RemoveAllDynObjects(); iter->GetSource()->RemoveAllAreaTriggers(); - if (iter->GetSource()->IsInCombat()) + if (iter->GetSource()->IsInCombat() || !iter->GetSource()->getThreatManager().areThreatListsEmpty()) { iter->GetSource()->CombatStop(); iter->GetSource()->DeleteThreatList(); -- cgit v1.2.3