From 9bb780793556fc82e45fd56a6f59c27d4050eb94 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Sun, 22 Feb 2009 17:03:01 -0600
Subject: *Check IsInWorld() when calling GetMap() in RemoveFromWorld(). This
 may fix some crash bugs.

--HG--
branch : trunk
---
 src/game/Object.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 7ec15d40d7c..6c65667c9aa 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -1101,7 +1101,7 @@ void WorldObject::AddToWorld()
 
 void WorldObject::RemoveFromWorld()
 {
-    if(m_isActive && !isType(TYPEMASK_PLAYER))
+    if(m_isActive && IsInWorld() && !isType(TYPEMASK_PLAYER))
         GetMap()->RemoveActiveObject(this);
     Object::RemoveFromWorld();
 }
-- 
cgit v1.2.3