From a30e3b7bd3483bc19be6ab4eebe94d9d79c382f6 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Wed, 12 Aug 2009 13:03:44 -0500
Subject: *Fix a crash caused by addnpc command.

--HG--
branch : trunk
---
 src/game/Object.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/game/Object.cpp')

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)
-- 
cgit v1.2.3