From 6ab3877c91c9440b81cf1c7c66a1275ee04ea26a Mon Sep 17 00:00:00 2001 From: Traesh Date: Sun, 29 Jan 2017 00:00:43 +0100 Subject: Core/Entities: Basic AreaTrigger System (#18035) * Implemented AreaTrigger Templates * Implemented AreaTrigger Splines * Implemented SPELL_AURA_AREA_TRIGGER * and many more --- src/server/game/Grids/ObjectGridLoader.cpp | 4 +++- 1 file changed, 3 insertions(+), 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 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 &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(); -- cgit v1.2.3