aboutsummaryrefslogtreecommitdiff
path: root/src/game/PetHandler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/PetHandler.cpp')
-rw-r--r--src/game/PetHandler.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp
index 60a4bec0891..ac198c0be67 100644
--- a/src/game/PetHandler.cpp
+++ b/src/game/PetHandler.cpp
@@ -104,9 +104,6 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
if( GetPlayer()->IsFriendlyTo(TargetUnit))
return;
- if(pet->getVictim())
- pet->AttackStop();
-
if(pet->GetTypeId() != TYPEID_PLAYER)
{
if (((Creature*)pet)->AI())
@@ -123,6 +120,9 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
}
else // charmed player
{
+ if(pet->getVictim() && pet->getVictim() != TargetUnit)
+ pet->AttackStop();
+
pet->Attack(TargetUnit,true);
pet->SendPetAIReaction(guid1);
}