diff options
| -rw-r--r-- | src/server/game/AI/CoreAI/PetAI.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp index 8f9d496fbf..58f3e59af1 100644 --- a/src/server/game/AI/CoreAI/PetAI.cpp +++ b/src/server/game/AI/CoreAI/PetAI.cpp @@ -252,8 +252,10 @@ void PetAI::UpdateAI(uint32 diff) if (spellInfo->CanBeUsedInCombat()) { // Check if we're in combat or commanded to attack (exlude auras with infinity duration) - if (!me->IsInCombat() && !me->GetCharmInfo()->IsCommandAttack() && spellInfo->GetMaxDuration() != -1) + if (!me->IsInCombat() && spellInfo->GetMaxDuration() != -1 && !me->IsPetInCombat()) + { continue; + } } Spell* spell = new Spell(me, spellInfo, TRIGGERED_NONE); |