aboutsummaryrefslogtreecommitdiff
path: root/src/game/Object.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/Object.cpp')
-rw-r--r--src/game/Object.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 4c100328adb..d8903409d48 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -1704,7 +1704,7 @@ void WorldObject::SendObjectDeSpawnAnim(uint64 guid)
void WorldObject::SetMap(Map * map)
{
ASSERT(map);
- //ASSERT(!IsInWorld());
+ ASSERT(!IsInWorld() || GetTypeId() == TYPEID_CORPSE);
ASSERT(!m_currMap);
m_currMap = map;
if(m_isWorldObject)
@@ -1714,7 +1714,7 @@ void WorldObject::SetMap(Map * map)
void WorldObject::ResetMap()
{
ASSERT(m_currMap);
- //ASSERT(!IsInWorld() || GetTypeId() == TYPEID_CORPSE);
+ ASSERT(!IsInWorld() || GetTypeId() == TYPEID_CORPSE);
if(m_isWorldObject)
m_currMap->RemoveWorldObject(this);
m_currMap = NULL;