*Delete object after map update. This will make mtmap safer.

--HG--
branch : trunk

1 files changed, 5 insertions, 15 deletions

diff --git a/src/game/MapInstanced.cpp b/src/game/MapInstanced.cpp
index e423abbad31..d06d2b9b677 100644
--- a/src/game/MapInstanced.cpp
+++ b/src/game/MapInstanced.cpp
@@ -60,31 +60,21 @@ void MapInstanced::Update(const uint32& t)
     }
 }
 
-void MapInstanced::MoveAllCreaturesInMoveList()
+void MapInstanced::DelayedUpdate(const uint32 diff)
 {
     for (InstancedMaps::iterator i = m_InstancedMaps.begin(); i != m_InstancedMaps.end(); ++i)
-    {
-        i->second->MoveAllCreaturesInMoveList();
-    }
+        i->second->DelayedUpdate(diff);
 
-    Map::MoveAllCreaturesInMoveList();
-}
-
-void MapInstanced::RemoveAllObjectsInRemoveList()
-{
-    for (InstancedMaps::iterator i = m_InstancedMaps.begin(); i != m_InstancedMaps.end(); ++i)
-    {
-        i->second->RemoveAllObjectsInRemoveList();
-    }
-
-    Map::RemoveAllObjectsInRemoveList();
+    Map::DelayedUpdate(diff); // this may be removed
 }
 
+/*
 void MapInstanced::RelocationNotify()
 {
     for (InstancedMaps::iterator i = m_InstancedMaps.begin(); i != m_InstancedMaps.end(); ++i)
         i->second->RelocationNotify();
 }
+*/
 
 bool MapInstanced::RemoveBones(uint64 guid, float x, float y)
 {