diff options
| author | jackpoz <giacomopoz@gmail.com> | 2014-05-19 21:44:15 +0200 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2014-05-19 21:44:15 +0200 |
| commit | 0166d9bf89b07295d65017eed1e48c42a521f5d6 (patch) | |
| tree | 1fb1dd448abd4c3f601857d6575221ad4b0718a0 | |
| parent | 35d5e6325800a8dbb4488bc6f9646bd66020c78a (diff) | |
| parent | 8aee9dd9489bfb60b321368dd4465700f13b35e5 (diff) | |
Merge pull request #12083 from Trisjdc/pet_combat
Core/PetAI: Pet's owner should NOT enter combat when the pet attacks/enters combat
| -rw-r--r-- | src/server/game/AI/CoreAI/PetAI.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp index e2eeaf880ad..f0a75403c8c 100644 --- a/src/server/game/AI/CoreAI/PetAI.cpp +++ b/src/server/game/AI/CoreAI/PetAI.cpp @@ -459,9 +459,6 @@ void PetAI::DoAttack(Unit* target, bool chase) if (me->Attack(target, true)) { - if (Unit* owner = me->GetOwner()) - owner->SetInCombatWith(target); - // Play sound to let the player know the pet is attacking something it picked on its own if (me->HasReactState(REACT_AGGRESSIVE) && !me->GetCharmInfo()->IsCommandAttack()) me->SendPetAIReaction(me->GetGUID()); |