*Merge.

--HG--
branch : trunk

1 files changed, 4 insertions, 0 deletions

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 598b74e903f..9cd5105a9e5 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -474,6 +474,8 @@ Map::Add(T *obj)
 
     AddToGrid(obj,grid,cell);
     obj->AddToWorld();
+    if(obj->isActive())
+        AddActiveObject(obj);
 
     DEBUG_LOG("Object %u enters grid[%u,%u]", GUID_LOPART(obj->GetGUID()), cell.GridX(), cell.GridY());
 
@@ -799,6 +801,8 @@ Map::Remove(T *obj, bool remove)
     assert( grid != NULL );
 
     obj->RemoveFromWorld();
+    if(obj->isActive())
+        RemoveActiveObject(obj);
     RemoveFromGrid(obj,grid,cell);
 
     UpdateObjectVisibility(obj,cell,p);