*Fix the bug that player's pet enterevademode repeatedly.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-08-06 14:39:06 -05:00
parent 624bd6a1f0
commit 91885a7790
+3 -4
View File
@@ -11533,15 +11533,13 @@ Unit* Creature::SelectVictim()
// No taunt aura or taunt aura caster is dead standart target selection // No taunt aura or taunt aura caster is dead standart target selection
target = m_ThreatManager.getHostilTarget(); target = m_ThreatManager.getHostilTarget();
} }
else else if(!HasReactState(REACT_PASSIVE))
{ {
// We have player pet probably // We have player pet probably
target = getAttackerForHelper(); target = getAttackerForHelper();
if (!target && isSummon()) if (!target && isSummon())
{ {
if (Unit * owner = ((TempSummon*)this)->GetOwner()) if (Unit * owner = ((TempSummon*)this)->GetOwner())
{
if (HasReactState(REACT_AGGRESSIVE) || HasReactState(REACT_DEFENSIVE))
{ {
if (owner->isInCombat()) if (owner->isInCombat())
target = owner->getAttackerForHelper(); target = owner->getAttackerForHelper();
@@ -11559,7 +11557,8 @@ Unit* Creature::SelectVictim()
} }
} }
} }
} else
return NULL;
if(target) if(target)
{ {