From 57ee357c0248f23c965aa1079cc6d4258f0af1d2 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Thu, 13 Jan 2011 21:33:56 +0100 Subject: Core/Maps: Fix a possible crash in ObjectGridStoper:Visit Dump found here: http://pastebin.com/2GZ3t5v4 --- src/server/game/Grids/ObjectGridLoader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp index 89bf39b1fe5..09d623c84d0 100755 --- a/src/server/game/Grids/ObjectGridLoader.cpp +++ b/src/server/game/Grids/ObjectGridLoader.cpp @@ -280,13 +280,13 @@ ObjectGridStoper::Visit(CreatureMapType &m) // stop any fights at grid de-activation and remove dynobjects created at cast by creatures for (CreatureMapType::iterator iter=m.begin(); iter != m.end(); ++iter) { - iter->getSource()->RemoveAllDynObjects(); if (iter->getSource()->isInCombat()) { iter->getSource()->CombatStop(); iter->getSource()->DeleteThreatList(); - iter->getSource()->AI()->EnterEvadeMode(); + iter->getSource()->AI()->EnterEvadeMode(); // Calls RemoveAllAuras } + iter->getSource()->RemoveAllDynObjects(); // Calls RemoveFromWorld, needs to be after RemoveAllAuras or we invalidate the Owner pointer of the aura } } -- cgit v1.2.3