diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Object.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/game/Object.cpp b/src/game/Object.cpp index 9af456989c7..d98784bc602 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -1710,8 +1710,11 @@ void WorldObject::SetMap(Map * map) ASSERT(!IsInWorld() || GetTypeId() == TYPEID_CORPSE); if(m_currMap == map) // command add npc: first create, than loadfromdb return; - - ASSERT(!m_currMap); + if(m_currMap) + { + sLog.outCrash("WorldObject::SetMap: obj %u new map %u %u, old map %u %u", (uint32)GetTypeId(), map->GetId(), map->GetInstanceId(), m_currMap->GetId(), m_currMap->GetInstanceId()); + assert(false); + } m_currMap = map; m_mapId = map->GetId(); m_InstanceId = map->GetInstanceId(); |