Creature: Implement tbc version of CreatureStaticFlags2::IGNORE_MISDI…

…RECTION
cmangos · Dec 27, 2024 · f5e29b3 · f5e29b3
1 parent 63d8f52
commit f5e29b3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/src/game/Combat/ThreatManager.cpp b/src/game/Combat/ThreatManager.cpp
@@ -468,7 +468,7 @@ void ThreatManager::addThreat(Unit* victim, float threat, bool crit, SpellSchool
 
     float calculatedThreat = ThreatCalcHelper::CalcThreat(victim, iOwner, threat, crit, schoolMask, threatSpell, assist);
 
-    if (calculatedThreat > 0.0f)
+    if (calculatedThreat > 0.0f && !iOwner->IsIgnoringMisdirection())
     {
         if (Unit* redirectedTarget = victim->getHostileRefManager().GetThreatRedirectionTarget())
         {

diff --git a/src/game/Entities/Creature.cpp b/src/game/Entities/Creature.cpp
@@ -3017,6 +3017,11 @@ bool Creature::IsPreventingDeath() const
     return m_settings.HasFlag(CreatureStaticFlags::UNKILLABLE);
 }
 
+bool Creature::IsIgnoringMisdirection() const
+{
+    return m_settings.HasFlag(CreatureStaticFlags2::IGNORE_MISDIRECTION);
+}
+
 bool Creature::IsCorpseExpired() const
 {
     auto now = GetMap()->GetCurrentClockTime();

diff --git a/src/game/Entities/Creature.h b/src/game/Entities/Creature.h
@@ -872,6 +872,8 @@ class Creature : public Unit
 
         bool IsPreventingDeath() const override;
 
+        bool IsIgnoringMisdirection() const override;
+
         virtual void AddCooldown(SpellEntry const& spellEntry, ItemPrototype const* itemProto = nullptr, bool permanent = false, uint32 forcedDuration = 0, bool ignoreCat = false) override;
 
         // spell scripting persistency

diff --git a/src/game/Entities/Unit.h b/src/game/Entities/Unit.h
@@ -2507,6 +2507,7 @@ class Unit : public WorldObject
 
         virtual bool IsNoWeaponSkillGain() const { return false; }
         virtual bool IsPreventingDeath() const { return false; }
+        virtual bool IsIgnoringMisdirection() const { return false; }
 
         virtual CreatureInfo const* GetMountInfo() const { return nullptr; } // TODO: Meant to be used by players during taxi
         virtual void SetMountInfo(CreatureInfo const* info) {} // does nothing for base unit