diff options
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartAI.cpp | 6 | ||||
| -rwxr-xr-x | src/server/game/Grids/Notifiers/GridNotifiers.h | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 72dbb4baff7..253ac6c9155 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -469,6 +469,9 @@ void SmartAI::MoveInLineOfSight(Unit* who) if (!CanAIAttack(who)) return; + + if (!me->canStartAttack(who, false)) + return; if (me->IsHostileTo(who)) { @@ -487,9 +490,6 @@ void SmartAI::MoveInLineOfSight(Unit* who) } } } - - //if (me->canStartAttack(who, false)) - // AttackStart(who); } bool SmartAI::CanAIAttack(const Unit* /*who*/) const diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h index 2ed74279224..0af2c7f82dc 100755 --- a/src/server/game/Grids/Notifiers/GridNotifiers.h +++ b/src/server/game/Grids/Notifiers/GridNotifiers.h @@ -1025,15 +1025,11 @@ namespace Trinity return false; if (m_force) - { if (!me->IsValidAttackTarget(u)) return false; - } else - { if (!me->canStartAttack(u, false)) return false; - } m_range = me->GetDistance(u); // use found unit range as new range limit for next check return true; |