Creature: Adjust updateentry overwriting some critical unit flags

Closes #480
cmangos · Nov 14, 2023 · 49f511f · 49f511f
1 parent b0343ae
commit 49f511f
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/game/Entities/Creature.cpp b/src/game/Entities/Creature.cpp
@@ -571,8 +571,14 @@ bool Creature::UpdateEntry(uint32 Entry, const CreatureData* data /*=nullptr*/,
     if (m_movementInfo.HasMovementFlag(MOVEFLAG_SWIMMING))
         unitFlags |= UNIT_FLAG_SWIMMING;
 
+    uint32 unitFlags2 = GetCreatureInfo()->UnitFlags2;
+    if (HasFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH))
+        unitFlags2 |= UNIT_FLAG2_FEIGN_DEATH;
+    if (HasFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_CLONED))
+        unitFlags2 |= UNIT_FLAG2_CLONED;
+
     SetUInt32Value(UNIT_FIELD_FLAGS, unitFlags);
-    SetUInt32Value(UNIT_FIELD_FLAGS_2, GetCreatureInfo()->UnitFlags2);
+    SetUInt32Value(UNIT_FIELD_FLAGS_2, unitFlags2);
 
     // preserve all current dynamic flags if exist
     uint32 dynFlags = GetUInt32Value(UNIT_DYNAMIC_FLAGS);