Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Partial revert of fcf58e7 (both check performed inside IsInMeleeRange)

Browse Source
This commit is contained in:
Spp-
2011-09-06 10:36:20 +02:00
parent ea14e096ac
commit b7882e0fa8
1 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/server/game/AI/CoreAI/UnitAI.cpp
View File

@@ -43,27 +43,17 @@ void UnitAI::DoMeleeAttackIfReady()
return;
Unit *victim = me->getVictim();
if (!victim || !victim->IsInWorld())
return;
//Make sure our attack is ready and we aren't currently casting before checking distance
if (me->isAttackReady())
if (me->isAttackReady() && me->IsWithinMeleeRange(victim))
{
//If we are within range melee the target
if (me->IsWithinMeleeRange(victim))
{
me->AttackerStateUpdate(victim);
me->resetAttackTimer();
}
me->AttackerStateUpdate(victim);
me->resetAttackTimer();
}
if (me->haveOffhandWeapon() && me->isAttackReady(OFF_ATTACK))
if (me->haveOffhandWeapon() && me->isAttackReady(OFF_ATTACK) && me->IsWithinMeleeRange(victim))
{
//If we are within range melee the target
if (me->IsWithinMeleeRange(victim))
{
me->AttackerStateUpdate(victim, OFF_ATTACK);
me->resetAttackTimer(OFF_ATTACK);
}
me->AttackerStateUpdate(victim, OFF_ATTACK);
me->resetAttackTimer(OFF_ATTACK);
}
}