diff options
| author | silinoron <none@none> | 2010-08-23 14:46:10 -0700 |
|---|---|---|
| committer | silinoron <none@none> | 2010-08-23 14:46:10 -0700 |
| commit | e581feb551cb54803da1478da04032e260b35937 (patch) | |
| tree | 49b4dce7ab187ad39620a08d4f61f6b3dcdb2948 /src/server/game/Server | |
| parent | 181b995e38dd93e057159463c77d8ec8842bca74 (diff) | |
Pets should inherit owner's hostility status for the purposes of target checking
Based on patch by Toni.Shocker
Fixes issue #3552
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Server')
| -rw-r--r-- | src/server/game/Server/Protocol/Handlers/PetHandler.cpp | 5 |
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)) |