From 8be23fcbbdf26e8169defd761e61765f301bebe0 Mon Sep 17 00:00:00 2001 From: Treeston Date: Sat, 1 Jul 2017 20:18:02 +0200 Subject: [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) --- .../HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp | 2 +- .../Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/scripts/Outland/HellfireCitadel') diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index 858705111b0..5b2c6d1f6f8 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -141,7 +141,7 @@ class boss_nazan : public CreatureScript me->SetDisableGravity(false); me->SetWalk(true); me->GetMotionMaster()->Clear(); - if (Unit* victim = SelectTarget(SELECT_TARGET_NEAREST, 0)) + if (Unit* victim = SelectTarget(SELECT_TARGET_MINDISTANCE, 0)) AttackStart(victim); DoStartMovement(me->GetVictim()); Talk(EMOTE); diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index eea4b8d15f3..70aecff5f91 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -344,8 +344,8 @@ class boss_warbringer_omrogg : public CreatureScript if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoYellForThreat(); - DoResetThreat(); - me->AddThreat(target, 0.0f); + ResetThreatList(); + AddThreat(target, 0.0f); } ResetThreat_Timer = 25000 + rand32() % 15000; } -- cgit v1.2.3