aboutsummaryrefslogtreecommitdiff
path: root/src/game/Object.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/Object.h')
-rw-r--r--src/game/Object.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/game/Object.h b/src/game/Object.h
index 3448fb83899..a4b7506ca30 100644
--- a/src/game/Object.h
+++ b/src/game/Object.h
@@ -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); }