From 27adb19eb86fd4d4b22439259014d5e39c104c03 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Mon, 1 Dec 2008 13:29:08 -0600
Subject: [PATCH] *Try to fix a bug that crash happens in GetInstance().

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

diff --git a/src/game/ObjectAccessor.cpp b/src/game/ObjectAccessor.cpp
index 75f0d69777..82e01e6529 100644
--- a/src/game/ObjectAccessor.cpp
+++ b/src/game/ObjectAccessor.cpp
@@ -569,7 +569,7 @@ ObjectAccessor::Update(uint32 diff)
         {
             Object* obj = *i_objects.begin();
             i_objects.erase(i_objects.begin());
-            if (!obj)
+            if (!obj || !obj->IsInWorld())
                 continue;
             _buildUpdateObject(obj, update_players);
             obj->ClearUpdateMask(false);