From 2ecf4550906909b06d33d6358822fc3f8a30e1cd Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Tue, 21 Apr 2009 11:18:46 -0500
Subject: [PATCH] *Move move and remove obj from world update to map update.

--HG--
branch : trunk
---
 src/game/Map.cpp   | 2 ++
 src/game/World.cpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 8a673c8937d..65c30f1781e 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -821,7 +821,9 @@ void Map::Update(const uint32 &t_diff)
 
     i_lock = true;
 
+    MoveAllCreaturesInMoveList();
     RelocationNotify();
+    RemoveAllObjectsInRemoveList();
 
     // Don't unload grids if it's battleground, since we may have manually added GOs,creatures, those doesn't load from DB at grid re-load !
     // This isn't really bother us, since as soon as we have instanced BG-s, the whole map unloads as the BG gets ended
diff --git a/src/game/World.cpp b/src/game/World.cpp
index 85a156c7206..b50e8476283 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -1616,7 +1616,7 @@ void World::Update(time_t diff)
 
     /// </ul>
     ///- Move all creatures with "delayed move" and remove and delete all objects with "delayed remove"
-    MapManager::Instance().DoDelayedMovesAndRemoves();
+    //MapManager::Instance().DoDelayedMovesAndRemoves();
 
     // update the instance reset times
     sInstanceSaveManager.Update();