*Add an assert in ~worldobject

--HG--
branch : trunk

2 files changed, 2 insertions, 4 deletions

diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index edf7f949d26..334790402b9 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -80,17 +80,15 @@ Object::Object( ) : m_PackGUID(sizeof(uint64)+1)
     m_PackGUID.appendPackGUID(0);
 }
 
-/*
 WorldObject::~WorldObject()
 {
-    if(m_currMap)
+    if(m_isWorldObject && m_currMap)
     {
         sLog.outCrash("Object::~Object - guid="UI64FMTD", typeid=%d, entry=%u deleted but still in map!!", GetGUID(), GetTypeId(), GetEntry());
         assert(false);
         ResetMap();
     }
 }
-*/
 
 Object::~Object( )
 {
diff --git a/src/game/Object.h b/src/game/Object.h
index 28825d2154f..74527ca5df2 100644
--- a/src/game/Object.h
+++ b/src/game/Object.h
@@ -367,7 +367,7 @@ class TRINITY_DLL_SPEC Object
 class TRINITY_DLL_SPEC WorldObject : public Object
 {
     public:
-        virtual ~WorldObject ( ) {}
+        virtual ~WorldObject();
 
         virtual void Update ( uint32 /*time_diff*/ ) { }