*Merge.

--HG--
branch : trunk

src/game/Object.cpp

@@ -1674,7 +1674,9 @@ Map const* WorldObject::GetBaseMap() const
 
 void WorldObject::AddObjectToRemoveList()
 {
-    Map* map = MapManager::Instance().FindMap(GetMapId(), GetInstanceId());
+    assert(m_uint32Values);
+
+    Map* map = FindMap();
     if(!map)
     {
         sLog.outError("Object (TypeId: %u Entry: %u GUID: %u) at attempt add to move list not have valid map (Id: %u).",GetTypeId(),GetEntry(),GetGUIDLow(),GetMapId());