diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2017-07-01 20:18:02 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-08-13 22:46:44 +0200 |
| commit | 8be23fcbbdf26e8169defd761e61765f301bebe0 (patch) | |
| tree | 6309b79f7dd617a8ddc801624dbbd4ed7ac22174 /src/server/scripts/Maelstrom | |
| parent | 2c99678118798279372f17d4bb5f5a88ac95c413 (diff) | |
[3.3.5] Combat/Threat rewrite - prep & refactor (#19966)
* Combat/Threat rewrite (PR #19930) prep work. Mostly refactors, and a compatibility layer on ThreatManager/HostileReference that allows scripts to be changed already.
(cherry picked from commit e2a1ccd118d129b96e09ff1a15ed0adb1d4a3897)
Diffstat (limited to 'src/server/scripts/Maelstrom')
| -rw-r--r-- | src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Maelstrom/Stonecore/stonecore.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp index cbbb3850ff0..7b4cc3a1f63 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp @@ -323,7 +323,7 @@ public: if (Unit* target = me->SelectNearestPlayer(200.0f)) { - me->AddThreat(target, 0.0f); + AddThreat(target, 0.0f); me->SetInCombatWith(target); target->SetInCombatWith(me); DoStartMovement(target); diff --git a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp index d1619e5f41c..e4cef0e8a00 100644 --- a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp @@ -173,7 +173,7 @@ class npc_sc_millhouse_manastorm : public CreatureScript me->RemoveAllAuras(); me->CombatStop(true); - me->DeleteThreatList(); + me->GetThreatManager().ClearAllThreat(); switch (pointId) { |