*Fix a crash caused by addnpc command.
--HG-- branch : trunk
This commit is contained in:
@@ -1705,6 +1705,9 @@ void WorldObject::SetMap(Map * map)
|
|||||||
{
|
{
|
||||||
ASSERT(map);
|
ASSERT(map);
|
||||||
ASSERT(!IsInWorld() || GetTypeId() == TYPEID_CORPSE);
|
ASSERT(!IsInWorld() || GetTypeId() == TYPEID_CORPSE);
|
||||||
|
if(m_currMap == map) // command add npc: first create, than loadfromdb
|
||||||
|
return;
|
||||||
|
|
||||||
ASSERT(!m_currMap);
|
ASSERT(!m_currMap);
|
||||||
m_currMap = map;
|
m_currMap = map;
|
||||||
if(m_isWorldObject)
|
if(m_isWorldObject)
|
||||||
|
|||||||
Reference in New Issue
Block a user