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) --- src/server/scripts/World/boss_emerald_dragons.cpp | 2 +- src/server/scripts/World/npcs_special.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/scripts/World') diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp index a1b674d368c..887ac065b8e 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -154,7 +154,7 @@ struct emerald_dragonAI : public WorldBossAI return; } - if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, -50.0f, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_MAXTHREAT, 0, -50.0f, true)) DoCast(target, SPELL_SUMMON_PLAYER); DoMeleeAttackIfReady(); diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 60db94dbf63..3c98e5ba766 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -1805,7 +1805,7 @@ public: void DamageTaken(Unit* doneBy, uint32& damage) override { - me->AddThreat(doneBy, float(damage)); // just to create threat reference + AddThreat(doneBy, float(damage)); // just to create threat reference _damageTimes[doneBy->GetGUID()] = time(NULL); damage = 0; } -- cgit v1.2.3