Implement Eye of Kilrogg threat propagation disabling and remove redu…

…ndant code
cmangos · Aug 17, 2021 · 51ab47c · 51ab47c
1 parent d8d0464
commit 51ab47c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/src/game/Combat/ThreatManager.cpp b/src/game/Combat/ThreatManager.cpp
@@ -512,7 +512,7 @@ void ThreatManager::addThreatDirectly(Unit* victim, float threat)
         Unit* owner = getOwner();
         owner->TriggerAggroLinkingEvent(victim);
         Unit* victim_owner = victim->GetMaster();
-        if (victim_owner && victim_owner->IsAlive() && victim_owner->CanJoinInAttacking(getOwner()) && !victim_owner->hasUnitState(UNIT_STAT_FEIGN_DEATH))
+        if (victim->IsPropagatingThreatToOwner() && victim_owner && victim_owner->IsAlive() && victim_owner->CanJoinInAttacking(getOwner()))
             addThreat(victim_owner, 0.0f); // create a threat to the owner of a pet, if the pet attacks
         if (owner->IsOfflineTarget(victim) || victim->IsPlayer() && static_cast<Player*>(victim)->IsGameMaster())
             hostileReference->setOnlineOfflineState(false); // GM is always offline

diff --git a/src/game/Entities/Unit.cpp b/src/game/Entities/Unit.cpp
@@ -358,6 +358,7 @@ Unit::Unit() :
     m_alwaysHit = false;
     m_noThreat = false;
     m_supportThreatOnly = false;
+    m_ownerThreatPropagation = true;
     m_extraAttacksExecuting = false;
     m_debuggingMovement = false;
 
@@ -2134,10 +2135,11 @@ void Unit::DealMeleeDamage(CalcDamageInfo* calcDamageInfo, bool durabilityLoss)
             // if damage pVictim call AI reaction
             victim->AttackedBy(this);
 
-            if (Unit* owner = GetOwner())
-                if (owner->GetTypeId() == TYPEID_UNIT)
-                    if (owner->CanJoinInAttacking(victim))
-                        owner->EngageInCombatWithAggressor(victim);
+            if (IsPropagatingThreatToOwner())
+                if (Unit* owner = GetOwner())
+                    if (owner->GetTypeId() == TYPEID_UNIT)
+                        if (owner->CanJoinInAttacking(victim))
+                            owner->EngageInCombatWithAggressor(victim);
 
             for (m_guardianPetsIterator = m_guardianPets.begin(); m_guardianPetsIterator != m_guardianPets.end();)
                 if (Pet* guardian = GetMap()->GetPet(*(m_guardianPetsIterator++)))
@@ -9445,7 +9447,7 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy)
             // TODO: Unify this combat propagation with linking combat propagation in threat system
             Unit* controller = GetMaster();
 
-            if (controller && controller->CanJoinInAttacking(enemy))
+            if (IsPropagatingThreatToOwner() && controller && controller->CanJoinInAttacking(enemy))
             {
                 if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED))
                 {
@@ -13357,7 +13359,8 @@ void Unit::Uncharm(Unit* charmed, uint32 spellId)
             {
                 attacker->AttackStop(true, true);
                 attacker->getThreatManager().modifyThreatPercent(charmed, -101);     // only remove the possessed creature from threat list because it can be filled by other players
-                attacker->AddThreat(this);
+                if (charmed->IsPropagatingThreatToOwner())
+                    attacker->AddThreat(this);
             }
 
             // we have to restore initial MotionMaster

diff --git a/src/game/Entities/Unit.h b/src/game/Entities/Unit.h
@@ -2461,6 +2461,9 @@ class Unit : public WorldObject
         void SetSupportThreatOnly(bool state) { m_supportThreatOnly = state; }
         bool IsSupportThreatOnly() { return m_supportThreatOnly; }
 
+        void DisableThreatPropagationToOwner() { m_ownerThreatPropagation = false; }
+        bool IsPropagatingThreatToOwner() { return m_ownerThreatPropagation; } // TBC+ - Eye of Kilrogg
+
         float GetAttackDistance(Unit const* pl) const;
         virtual uint32 GetDetectionRange() const { return 20.f; }
 
@@ -2675,6 +2678,7 @@ class Unit : public WorldObject
         bool m_alwaysHit;
         bool m_noThreat;
         bool m_supportThreatOnly;
+        bool m_ownerThreatPropagation;
         bool m_ignoreRangedTargets;                         // Ignores ranged targets when picking someone to attack
         bool m_debuggingMovement;
 

diff --git a/src/game/Spells/SpellAuras.cpp b/src/game/Spells/SpellAuras.cpp
@@ -3063,6 +3063,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                             if (pet && pet->GetEntry() == 4277)
                             {
                                 pet->CastSpell(pet, 2585, TRIGGERED_OLD_TRIGGERED);
+                                pet->DisableThreatPropagationToOwner();
                             }
                         }
                         break;