aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/game/Map.cpp2
-rw-r--r--src/game/World.cpp2
2 files changed, 3 insertions, 1 deletions
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();