aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/AI/ScriptedAI
diff options
context:
space:
mode:
authorKandera <KanderaDev@gmail.com>2012-04-12 13:29:51 -0400
committerKandera <KanderaDev@gmail.com>2012-04-12 13:29:51 -0400
commite88e0f08d1998dfbe0f35ac341dc7ed64a0ebdbc (patch)
tree78edff904a9aa67f0e3f495d0342d12d07a5ed16 /src/server/game/AI/ScriptedAI
parent305cd14e864c5c1651d63ab627d79ddaa8535f16 (diff)
parent71bf2684be58f6fdaebaeb480385769bd5934c85 (diff)
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Diffstat (limited to 'src/server/game/AI/ScriptedAI')
-rw-r--r--src/server/game/AI/ScriptedAI/ScriptedCreature.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
index 096ee695bcf..6d27d251579 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
@@ -114,15 +114,7 @@ void ScriptedAI::UpdateAI(uint32 const /*diff*/)
if (!UpdateVictim())
return;
- if (me->isAttackReady())
- {
- //If we are within range melee the target
- if (me->IsWithinMeleeRange(me->getVictim()))
- {
- me->AttackerStateUpdate(me->getVictim());
- me->resetAttackTimer();
- }
- }
+ DoMeleeAttackIfReady();
}
void ScriptedAI::DoStartMovement(Unit* victim, float distance, float angle)