*Merge.

--HG--
branch : trunk

1 files changed, 2 insertions, 0 deletions

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 0dabf205af7..adefb0770ae 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -732,7 +732,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