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.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index d8903409d48..87922808179 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -1705,6 +1705,9 @@ void WorldObject::SetMap(Map * map)
{
ASSERT(map);
ASSERT(!IsInWorld() || GetTypeId() == TYPEID_CORPSE);
+ if(m_currMap == map) // command add npc: first create, than loadfromdb
+ return;
+
ASSERT(!m_currMap);
m_currMap = map;
if(m_isWorldObject)