StaticFlags: Implement NO_MELEE_APPROACH (#539)

* StaticFlags: Implement NO_MELEE_APPROACH * StaticFlags: Fix meaning of No Melee (Approach) * StaticFlags: Only use SetMeleeEnabled once
cmangos · Oct 7, 2024 · 6bfa5f5 · 6bfa5f5
1 parent 081d066
commit 6bfa5f5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/game/AI/BaseAI/CreatureAI.cpp b/src/game/AI/BaseAI/CreatureAI.cpp
@@ -34,7 +34,8 @@ CreatureAI::CreatureAI(Creature* creature, uint32 combatActions) :
     m_deathPrevented(false), m_followAngle(0.f), m_followDist(0.f)
 {
     m_dismountOnAggro = !(m_creature->GetCreatureInfo()->CreatureTypeFlags & CREATURE_TYPEFLAGS_MOUNTED_COMBAT);
-    SetMeleeEnabled(!m_creature->GetSettings().HasFlag(CreatureStaticFlags::NO_MELEE_FLEE));
+    SetMeleeEnabled(!(m_creature->GetSettings().HasFlag(CreatureStaticFlags::NO_MELEE_FLEE)
+        || m_creature->GetSettings().HasFlag(CreatureStaticFlags4::NO_MELEE_APPROACH)));
     if (m_creature->GetSettings().HasFlag(CreatureStaticFlags::SESSILE))
         SetAIImmobilizedState(true);