diff options
Diffstat (limited to 'src/server/game/Grids/ObjectGridLoader.cpp')
| -rw-r--r-- | src/server/game/Grids/ObjectGridLoader.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp index 13de080ca2b..eab7573f552 100644 --- a/src/server/game/Grids/ObjectGridLoader.cpp +++ b/src/server/game/Grids/ObjectGridLoader.cpp @@ -213,10 +213,12 @@ void ObjectGridUnloader::Visit(GridRefManager<T> &m) void ObjectGridStoper::Visit(CreatureMapType &m) { - // stop any fights at grid de-activation and remove dynobjects created at cast by creatures + // stop any fights at grid de-activation and remove dynobjects/areatriggers created at cast by creatures for (CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter) { iter->GetSource()->RemoveAllDynObjects(); + iter->GetSource()->RemoveAllAreaTriggers(); + if (iter->GetSource()->IsInCombat()) { iter->GetSource()->CombatStop(); |