StaticFlags: Implement IGNORE_MISDIRECTION (#543)

* StaticFlags: Implement IGNORE_MISDIRECTION * StaticFlags: Simplify IgnoreMisdirection * StaticFlags: Fix misdirect ignore applied in incorrect place * StaticFlags: Break out of loop entire on misdirect ignore
cmangos · Oct 7, 2024 · 79b5982 · 79b5982
1 parent a765adf
commit 79b5982
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/src/game/Combat/ThreatManager.cpp b/src/game/Combat/ThreatManager.cpp
@@ -476,6 +476,8 @@ void ThreatManager::addThreat(Unit* victim, float threat, bool crit, SpellSchool
         auto& redirectionData = victim->getHostileRefManager().GetThreatRedirectionData();
         for (auto& redirection : redirectionData)
         {
+            if (getOwner()->IsIgnoringMisdirect())
+                break;
             float redirectedMod = redirection.second.mod;
             Unit* redirectedTarget = iOwner->GetMap()->GetUnit(redirection.second.target);
             if (!redirectedTarget)

diff --git a/src/game/Entities/Creature.cpp b/src/game/Entities/Creature.cpp
@@ -2958,6 +2958,18 @@ void Creature::SetIgnoreSanctuary(bool state)
         m_settings.RemoveFlag(CreatureStaticFlags2::IGNORE_SANCTUARY);
 }
 
+bool Creature::IsIgnoringMisdirect() const
+{
+    return m_settings.HasFlag(CreatureStaticFlags2::IGNORE_MISDIRECTION);
+}
+
+void Creature::SetIgnoreMisdirect(bool state)
+{
+    if (state)
+        m_settings.SetFlag(CreatureStaticFlags2::IGNORE_MISDIRECTION);
+    else
+        m_settings.RemoveFlag(CreatureStaticFlags2::IGNORE_MISDIRECTION);
+}
 
 void Creature::SetNoWoundedSlowdown(bool state)
 {

diff --git a/src/game/Entities/Creature.h b/src/game/Entities/Creature.h
@@ -860,6 +860,9 @@ class Creature : public Unit
         void SetNoWeaponSkillGain(bool state);
         bool IsNoWeaponSkillGain() const override;
 
+        bool IsIgnoringMisdirect() const override;
+        void SetIgnoreMisdirect(bool state);
+
         bool IsPreventingDeath() const override;
 
         virtual void AddCooldown(SpellEntry const& spellEntry, ItemPrototype const* itemProto = nullptr, bool permanent = false, uint32 forcedDuration = 0, bool ignoreCat = false) override;

diff --git a/src/game/Entities/Unit.h b/src/game/Entities/Unit.h
@@ -2464,6 +2464,8 @@ class Unit : public WorldObject
         virtual bool IsIgnoringFeignDeath() const { return false; }
         virtual bool IsIgnoringSanctuary() const { return false; }
 
+        virtual bool IsIgnoringMisdirect() const { return false; }
+
         virtual bool IsSlowedInCombat() const { return false; }
 
         void InterruptSpellsCastedOnMe(bool killDelayed = false);