diff options
| -rw-r--r-- | src/game/Map.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp index 140904bfb19..4785d9bf91e 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -2707,7 +2707,12 @@ void BattleGroundMap::UnloadAll() Creature* Map::GetCreature(uint64 guid) { - Creature * ret = ObjectAccessor::GetObjectInWorld(guid, (Creature*)NULL); + Creature * ret = NULL; + if(IS_CREATURE_GUID(guid)) + ret = ObjectAccessor::GetObjectInWorld(guid, (Creature*)NULL); + else if(IS_VEHICLE_GUID(guid)) + ret = ObjectAccessor::GetObjectInWorld(guid, (Vehicle*)NULL); + if(!ret) return NULL; |