*Merge.

--HG--
branch : trunk

src/game/Object.cpp

@@ -1145,6 +1145,7 @@ WorldObject::WorldObject()
 
     m_mapId             = 0;
     m_InstanceId        = 0;
+    m_map               = NULL;
 
     m_name = "";
 
@@ -1674,12 +1675,14 @@ void WorldObject::SendObjectDeSpawnAnim(uint64 guid)
 
 Map* WorldObject::GetMap() const
 {
-    return MapManager::Instance().GetMap(GetMapId(), this);
+    if(m_map) return m_map;
+    else return const_cast<Map*>(m_map) = MapManager::Instance().GetMap(GetMapId(), this);
 }
 
 Map* WorldObject::FindMap() const
 {
-    return MapManager::Instance().FindMap(GetMapId(), GetInstanceId());
+    if(m_map) return m_map;
+    else return const_cast<Map*>(m_map) = MapManager::Instance().FindMap(GetMapId(), GetInstanceId());
 }
 
 Map const* WorldObject::GetBaseMap() const