diff options
Diffstat (limited to 'src/game/Object.cpp')
| -rw-r--r-- | src/game/Object.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/game/Object.cpp b/src/game/Object.cpp index b5f25596af3..07efce82458 100644 --- a/src/game/Object.cpp +++ b/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()); |