aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormegamage <none@none>2008-12-01 13:29:08 -0600
committermegamage <none@none>2008-12-01 13:29:08 -0600
commit27adb19eb86fd4d4b22439259014d5e39c104c03 (patch)
tree8aee878a1e6f4e034b21f9c914fe1530a99e67c4 /src
parentb192fb879c2f268ccdcbb8bbfc39df1c50a02867 (diff)
*Try to fix a bug that crash happens in GetInstance().
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/ObjectAccessor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/ObjectAccessor.cpp b/src/game/ObjectAccessor.cpp
index 75f0d697771..82e01e6529a 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);