*Try to fix some crash.

--HG-- branch : trunk
2009-04-01 21:17:59 -06:00
parent 1b6c44dae5
commit 30eedaa72d
5 changed files with 22 additions and 34 deletions
@@ -133,6 +133,8 @@ class TRINITY_DLL_SPEC Object
            if(m_inWorld)
                return;

+            assert(m_uint32Values);
+
            m_inWorld = true;

            // synchronize values mirror with values array (changes will send in updatecreate opcode any way
@@ -143,10 +145,10 @@ class TRINITY_DLL_SPEC Object
            if(!m_inWorld)
                return;

-            // if we remove from world then sending changes not required
-            if(m_uint32Values)
-                ClearUpdateMask(true);
            m_inWorld = false;
+
+            // if we remove from world then sending changes not required
+            ClearUpdateMask(true);
        }

        const uint64& GetGUID() const { return GetUInt64Value(0); }