*Merge

--HG--
branch : trunk

1 files changed, 10 insertions, 5 deletions

diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 0e7eed9bff0..3561621f0bd 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -82,16 +82,21 @@ Object::Object( ) : m_PackGUID(sizeof(uint64)+1)
 
 Object::~Object( )
 {
-    //if(m_objectUpdated)
-    //    ObjectAccessor::Instance().RemoveUpdateObject(this);
-
     if(IsInWorld())
     {
-        sLog.outCrash("Object::~Object - guid="UI64FMTD", typeid=%d deleted but still in world!!", GetGUID(), GetTypeId());
+        sLog.outCrash("Object::~Object - guid="UI64FMTD", typeid=%d, entry=%u deleted but still in world!!", GetGUID(), GetTypeId(), GetEntry());
+        if(isType(TYPEMASK_ITEM))
+            sLog.outCrash("Item slot %u", ((Item*)this)->GetSlot());
         assert(false);
+        RemoveFromWorld();
     }
 
-    assert(!m_objectUpdated);
+    if(m_objectUpdated)
+    {
+        sLog.outCrash("Object::~Object - guid="UI64FMTD", typeid=%d, entry=%u deleted but still in update list!!", GetGUID(), GetTypeId(), GetEntry());
+        assert(false);
+        ObjectAccessor::Instance().RemoveUpdateObject(this);
+    }
 
     if(m_uint32Values)
     {