aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
diff options
context:
space:
mode:
authorQAston <qaston@gmail.com>2011-09-16 23:49:31 +0200
committerQAston <qaston@gmail.com>2011-09-16 23:49:31 +0200
commitc0b1823524b33d1ec7d07e8ed85c4a6dafa2be99 (patch)
tree49779b65376f5a8d8c24c4c7aab3031e3a651222 /src/server/scripts
parent3a3f2d927f6b40f27ad49b788629e2873180b64c (diff)
Core/Entities: Replace Unit::canAttack usage with more accurate Unit::IsValidAttackTarget
Diffstat (limited to 'src/server/scripts')
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp4
-rw-r--r--src/server/scripts/Northrend/borean_tundra.cpp4
2 files changed, 4 insertions, 4 deletions
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);
}