*Check reactstate in UpdateVictim.
--HG-- branch : trunk
This commit is contained in:
+2
-11
@@ -134,12 +134,12 @@ bool CreatureAI::UpdateVictimWithGaze()
|
||||
return me->getVictim();
|
||||
}
|
||||
|
||||
bool CreatureAI::UpdateVictimByReact()
|
||||
bool CreatureAI::UpdateVictim()
|
||||
{
|
||||
if(!me->isInCombat())
|
||||
return false;
|
||||
|
||||
if(me->HasReactState(REACT_AGGRESSIVE))
|
||||
if(!me->HasReactState(REACT_PASSIVE))
|
||||
{
|
||||
if(Unit *victim = me->SelectVictim())
|
||||
AttackStart(victim);
|
||||
@@ -154,15 +154,6 @@ bool CreatureAI::UpdateVictimByReact()
|
||||
return true;
|
||||
}
|
||||
|
||||
bool CreatureAI::UpdateVictim()
|
||||
{
|
||||
if(!me->isInCombat())
|
||||
return false;
|
||||
if(Unit *victim = me->SelectVictim())
|
||||
AttackStart(victim);
|
||||
return me->getVictim();
|
||||
}
|
||||
|
||||
bool CreatureAI::_EnterEvadeMode()
|
||||
{
|
||||
if(me->IsInEvadeMode() || !me->isAlive())
|
||||
|
||||
@@ -71,7 +71,6 @@ class TRINITY_DLL_SPEC CreatureAI : public UnitAI
|
||||
Creature * const m_creature;
|
||||
|
||||
bool UpdateVictim();
|
||||
bool UpdateVictimByReact();
|
||||
bool UpdateVictimWithGaze();
|
||||
|
||||
void SelectNearestTarget(Unit *who);
|
||||
|
||||
Reference in New Issue
Block a user