*Merge.

--HG--
branch : trunk

1 files changed, 4 insertions, 6 deletions

diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 3ec11e83f81..f09e466e4b8 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -1673,16 +1673,14 @@ void WorldObject::SendObjectDeSpawnAnim(uint64 guid)
     SendMessageToSet(&data, true);
 }
 
-Map* WorldObject::GetMap() const
+Map* WorldObject::_getMap()
 {
-    if(m_map) return m_map;
-    else return const_cast<Map*>(m_map) = MapManager::Instance().GetMap(GetMapId(), this);
+    return m_map = MapManager::Instance().GetMap(GetMapId(), this);
 }
 
-Map* WorldObject::FindMap() const
+Map* WorldObject::_findMap()
 {
-    if(m_map) return m_map;
-    else return const_cast<Map*>(m_map) = MapManager::Instance().FindMap(GetMapId(), GetInstanceId());
+    return m_map = MapManager::Instance().FindMap(GetMapId(), GetInstanceId());
 }
 
 Map const* WorldObject::GetBaseMap() const