diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 46aa97946..b212b1f4c 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -376,7 +376,7 @@ void ScriptedAI::DoResetThreat() return; } - me->getThreatMgr().resetAllAggro(); + me->getThreatMgr().ResetAllThreat(); } float ScriptedAI::DoGetThreat(Unit* unit) diff --git a/src/server/game/Combat/ThreatMgr.h b/src/server/game/Combat/ThreatMgr.h index 180251f3d..92a7f52f2 100644 --- a/src/server/game/Combat/ThreatMgr.h +++ b/src/server/game/Combat/ThreatMgr.h @@ -233,6 +233,9 @@ public: // Reset all aggro without modifying the threadlist. void resetAllAggro(); + // -- compatibility layer for combat rewrite + void ResetAllThreat() { resetAllAggro(); } + // Reset all aggro of unit in threadlist satisfying the predicate. template void resetAggro(PREDICATE predicate) { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp index bc8ec18bb..25ce1fd22 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp @@ -597,7 +597,7 @@ public: { if (Creature* creatureCaster = caster->ToCreature()) { - creatureCaster->getThreatMgr().resetAllAggro(); + creatureCaster->getThreatMgr().ResetAllThreat(); } } } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp index 9ef1246a1..7dc4f823b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp @@ -170,7 +170,7 @@ public: if (Creature* creatureCaster = caster->ToCreature()) { - creatureCaster->getThreatMgr().resetAllAggro(); + creatureCaster->getThreatMgr().ResetAllThreat(); creatureCaster->getThreatMgr().addThreat(target, 1); creatureCaster->AI()->AttackStart(target); // Attack the target which caster will teleport to. } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp index 1f56ef9d8..d6428aae1 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp @@ -393,7 +393,7 @@ public: void HandleDummy(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); - GetCaster()->getThreatMgr().resetAllAggro(); + GetCaster()->getThreatMgr().ResetAllThreat(); if (Unit* target = GetHitUnit()) GetCaster()->CastSpell(target, SPELL_BLINK, true); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 68b4026c8..751097de4 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -296,7 +296,7 @@ public: uint8 rnd = LIST.size() > 1 ? urand(0, LIST.size() - 1) : 0; if( Unit* target = ObjectAccessor::GetUnit(*me, LIST.at(rnd)) ) { - me->getThreatMgr().resetAllAggro(); + me->getThreatMgr().ResetAllThreat(); me->AddThreat(target, 10000.0f); AttackStart(target); me->CastSpell(target, SPELL_MINIONS_CHARGE, false); @@ -749,7 +749,7 @@ public: uint8 rnd = LIST.size() > 1 ? urand(0, LIST.size() - 1) : 0; if( Unit* target = ObjectAccessor::GetUnit(*me, LIST.at(rnd)) ) { - me->getThreatMgr().resetAllAggro(); + me->getThreatMgr().ResetAllThreat(); me->AddThreat(target, 10000.0f); AttackStart(target); me->CastSpell(target, SPELL_MINIONS_CHARGE, false); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index e94f1d655..815ee0a33 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -161,7 +161,7 @@ public: if (me->HealthBelowPct(50)) { Talk(SAY_FLESH); - me->getThreatMgr().resetAllAggro(); + me->getThreatMgr().ResetAllThreat(); me->CastSpell((Unit*)nullptr, SPELL_TURN_FLESH, false); events.Reset(); @@ -257,7 +257,7 @@ public: void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { PreventDefaultAction(); - GetUnitOwner()->getThreatMgr().resetAllAggro(); + GetUnitOwner()->getThreatMgr().ResetAllThreat(); GetUnitOwner()->GetMotionMaster()->Clear(); GetUnitOwner()->CastSpell((Unit*)nullptr, SPELL_TURN_BONES, false); GetUnitOwner()->GetAI()->DoAction(ACTION_TURN_BONES); diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index 87d18bc0e..772890f19 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -125,7 +125,7 @@ public: case EVENT_ECK_SPRING: if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 30.0f, true)) { - me->getThreatMgr().resetAllAggro(); + me->getThreatMgr().ResetAllThreat(); me->AddThreat(target, 500.0f); me->CastSpell(target, SPELL_ECK_SPRING, false); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index 7e553e084..33c5e54c0 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -930,7 +930,7 @@ public: ScriptedAI::AttackStart(who); if (!targetGUID) { - me->getThreatMgr().resetAllAggro(); + me->getThreatMgr().ResetAllThreat(); me->AddThreat(who, 1000000.0f); targetGUID = who->GetGUID(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 789d5f13f..e68025ec0 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -1779,7 +1779,7 @@ public: for (ThreatContainer::StorageType::const_iterator iter = target_tl.begin(); iter != target_tl.end(); ++iter) me->getThreatMgr().addThreat((*iter)->getTarget(), (*iter)->getThreat()); - c->getThreatMgr().resetAllAggro(); + c->getThreatMgr().ResetAllThreat(); for (ThreatContainer::StorageType::const_iterator iter = me_tl.begin(); iter != me_tl.end(); ++iter) c->getThreatMgr().addThreat((*iter)->getTarget(), (*iter)->getThreat()); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 216294d9c..48295e0c4 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -1674,7 +1674,7 @@ public: if (!target || !caster) return; - caster->getThreatMgr().resetAllAggro(); + caster->getThreatMgr().ResetAllThreat(); caster->GetAI()->AttackStart(target); // Chase target caster->AddThreat(target, 10000000.0f); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index 8e98b0c8c..65c4f8987 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -138,7 +138,7 @@ public: heat->ModStackAmount(-1); } me->CastSpell(me, SPELL_MOLTEN, true); - me->getThreatMgr().resetAllAggro(); + me->getThreatMgr().ResetAllThreat(); } } } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index 7ee99dea3..3785a684f 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -1158,7 +1158,7 @@ public: } } _playerAttack = true; - me->getThreatMgr().resetAllAggro(); + me->getThreatMgr().ResetAllThreat(); me->CallForHelp(40.0f); AttackStart(who); } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index b7279b6ed..4136d491b 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -191,7 +191,7 @@ public: if (switchTimer >= 10000) { switchTimer = 0; - me->getThreatMgr().resetAllAggro(); + me->getThreatMgr().ResetAllThreat(); if (Player* player = SelectTargetFromPlayerList(100.0f)) me->AddThreat(player, 100000.0f); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 89e1f8541..75e047572 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -619,7 +619,7 @@ public: me->SetDisableGravity(false); break; case EVENT_START_PHASE_3_LAND: - me->getThreatMgr().resetAllAggro(); + me->getThreatMgr().ResetAllThreat(); me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE); me->SetTarget(me->GetVictim()->GetGUID()); AttackStart(me->GetVictim()); @@ -632,7 +632,7 @@ public: // /////////////////////////// case EVENT_PHASE_4_START: me->CastSpell(me, SPELL_DEMON_TRANSFORM_1, true); - me->getThreatMgr().resetAllAggro(); + me->getThreatMgr().ResetAllThreat(); me->GetMotionMaster()->MoveChase(me->GetVictim(), 35.0f); events.Reset(); events.ScheduleEvent(EVENT_SPELL_SHADOW_BLAST, 11000); @@ -655,7 +655,7 @@ public: break; case EVENT_REMOVE_DEMON_FORM: me->CastSpell(me, SPELL_DEMON_TRANSFORM_1, true); - me->getThreatMgr().resetAllAggro(); + me->getThreatMgr().ResetAllThreat(); events.Reset(); if (summons.HasEntry(NPC_MAIEV_SHADOWSONG)) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index 2d8cbfefb..d9137125d 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -355,7 +355,7 @@ public: void HandleScriptEffect(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); - GetCaster()->getThreatMgr().resetAllAggro(); + GetCaster()->getThreatMgr().ResetAllThreat(); if (roll_chance_i(33)) if (Unit* target = GetCaster()->GetAI()->SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) diff --git a/src/server/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp index ee68b7e86..e26d7656e 100644 --- a/src/server/scripts/Pet/pet_mage.cpp +++ b/src/server/scripts/Pet/pet_mage.cpp @@ -164,7 +164,7 @@ struct npc_pet_mage_mirror_image : CasterAI if (selection) { - me->getThreatMgr().resetAllAggro(); + me->getThreatMgr().ResetAllThreat(); me->AddThreat(selection, 1000000.0f); if (owner->IsInCombat())