From 6af144277d248e6a28bd1edc428069f85ebcb53f Mon Sep 17 00:00:00 2001
From: QAston <none@none>
Date: Sat, 4 Jul 2009 21:07:06 +0200
Subject: *Temporary fix for crash caused by object list update.

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

(limited to 'src')

diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index d2d8044a322..b690dbccddb 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -77,9 +77,10 @@ void GameObject::CleanupsBeforeDelete()
         if(uint64 owner_guid = GetOwnerGUID())
         {
             Unit* owner = NULL;
-            if(IS_PLAYER_GUID(owner_guid))
+            // Object may be deleted while player is not in world, skip this check for now.
+            /*if(IS_PLAYER_GUID(owner_guid))
                 owner = ObjectAccessor::GetObjectInWorld(owner_guid, (Player*)NULL);
-            else
+            else*/
                 owner = ObjectAccessor::GetUnit(*this,owner_guid);
 
             if(owner)
-- 
cgit v1.2.3