From 1694ab1f9525043b8a020350e2b77dec69a9245c Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Thu, 9 Apr 2009 17:15:40 -0500
Subject: *Update Object deconstruct check.

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

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

diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 8aadd510fa9..924188bc3e2 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -85,17 +85,16 @@ Object::~Object( )
     //if(m_objectUpdated)
     //    ObjectAccessor::Instance().RemoveUpdateObject(this);
 
-    if(m_uint32Values)
+    if(IsInWorld())
     {
-        if(IsInWorld())
-        {
-            ///- Do NOT call RemoveFromWorld here, if the object is a player it will crash
-            sLog.outCrash("Object::~Object - guid="I64FMTD", typeid=%d deleted but still in world!!", GetGUID(), GetTypeId());
-            assert(false);
-        }
+        sLog.outCrash("Object::~Object - guid="I64FMTD", typeid=%d deleted but still in world!!", GetGUID(), GetTypeId());
+        assert(false);
+    }
 
-        assert(!m_objectUpdated);
+    assert(!m_objectUpdated);
 
+    if(m_uint32Values)
+    {
         //DEBUG_LOG("Object desctr 1 check (%p)",(void*)this);
         delete [] m_uint32Values;
         delete [] m_uint32Values_mirror;
-- 
cgit v1.2.3