From c0b1823524b33d1ec7d07e8ed85c4a6dafa2be99 Mon Sep 17 00:00:00 2001 From: QAston Date: Fri, 16 Sep 2011 23:49:31 +0200 Subject: Core/Entities: Replace Unit::canAttack usage with more accurate Unit::IsValidAttackTarget --- src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp | 4 ++-- src/server/scripts/Northrend/borean_tundra.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 856d0031d0d..5bd675ea0ba 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -226,7 +226,7 @@ public: Unit* eventStarter = Unit::GetUnit(*me, uiEventStarterGUID); - if (eventStarter && me->canAttack(eventStarter)) + if (eventStarter && me->IsValidAttackTarget(eventStarter)) AttackStart(eventStarter); else if (!UpdateVictim()) { @@ -250,7 +250,7 @@ public: // switch to "who" if nearer than current target. void SelectNearestTarget(Unit* who) { - if (me->getVictim() && me->GetDistanceOrder(who, me->getVictim()) && me->canAttack(who)) + if (me->getVictim() && me->GetDistanceOrder(who, me->getVictim()) && me->IsValidAttackTarget(who)) { me->getThreatManager().modifyThreatPercent(me->getVictim(), -100); me->AddThreat(who, 1000000.0f); diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index 02e6e8fc45b..5c7dc9abfda 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -862,7 +862,7 @@ public: void EnterCombat(Unit* who) { - if (me->canAttack(who)) + if (me->IsValidAttackTarget(who)) AttackStart(who); } @@ -1618,7 +1618,7 @@ public: void EnterCombat(Unit* who) { - if (me->canAttack(who)) + if (me->IsValidAttackTarget(who)) AttackStart(who); } -- cgit v1.2.3