aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Server/Protocol
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game/Server/Protocol')
-rw-r--r--src/server/game/Server/Protocol/Handlers/PetHandler.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Server/Protocol/Handlers/PetHandler.cpp b/src/server/game/Server/Protocol/Handlers/PetHandler.cpp
index 58899a942ac..354909a956e 100644
--- a/src/server/game/Server/Protocol/Handlers/PetHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/PetHandler.cpp
@@ -154,8 +154,9 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
if (!TargetUnit)
return;
- if (!pet->canAttack(TargetUnit))
- return;
+ if (Unit *owner = pet->GetOwner())
+ if (!owner->canAttack(TargetUnit))
+ return;
// Not let attack through obstructions
if (sWorld.getConfig(CONFIG_PET_LOS))