1 files changed, 3 insertions, 30 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index dbad99f79f0..2d86e17819c 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -3942,46 +3942,19 @@ void Map::ScriptsProcess()
 Creature*
 Map::GetCreature(uint64 guid)
 {
-    Creature * ret = NULL;
-    if (IS_CRE_OR_VEH_GUID(guid))
-      ret = ObjectAccessor::GetObjectInWorld(guid, (Creature*)NULL);
-
-    if (!ret)
-        return NULL;
-
-    if (ret->GetMapId() != GetId())
-        return NULL;
-
-    if (ret->GetInstanceId() != GetInstanceId())
-        return NULL;
-
-    return ret;
+    return ObjectAccessor::GetObjectInMap(guid, this, (Creature*)NULL);
 }
 
 GameObject*
 Map::GetGameObject(uint64 guid)
 {
-    GameObject * ret = ObjectAccessor::GetObjectInWorld(guid, (GameObject*)NULL);
-    if (!ret)
-        return NULL;
-    if (ret->GetMapId() != GetId())
-        return NULL;
-    if (ret->GetInstanceId() != GetInstanceId())
-        return NULL;
-    return ret;
+    return ObjectAccessor::GetObjectInMap(guid, this, (GameObject*)NULL);
 }
 
 DynamicObject*
 Map::GetDynamicObject(uint64 guid)
 {
-    DynamicObject * ret = ObjectAccessor::GetObjectInWorld(guid, (DynamicObject*)NULL);
-    if (!ret)
-        return NULL;
-    if (ret->GetMapId() != GetId())
-        return NULL;
-    if (ret->GetInstanceId() != GetInstanceId())
-        return NULL;
-    return ret;
+    return ObjectAccessor::GetObjectInMap(guid, this, (DynamicObject*)NULL);
 }
 
 void Map::UpdateIteratorBack(Player *player)