aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTrisjdc <trisjdc@gmail.com>2014-05-18 11:00:48 +0100
committerTrisjdc <trisjdc@gmail.com>2014-05-18 11:00:48 +0100
commit8aee9dd9489bfb60b321368dd4465700f13b35e5 (patch)
treeeabef823b84f600fbeb60f9c7134a98f975e90c2 /src
parent32386be8e7ff2ab0633069780d2d97b5a186e156 (diff)
Core/PetAI: Pet's owner should NOT enter combat when the pet attacks/enters combat
Diffstat (limited to 'src')
-rw-r--r--src/server/game/AI/CoreAI/PetAI.cpp3
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());