diff options
| author | megamage <none@none> | 2008-11-28 13:10:16 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2008-11-28 13:10:16 -0600 |
| commit | 93ba82e8ca62809ba048218ff8bca2f36d069962 (patch) | |
| tree | 39cb5ea3b2b9db0b6010f2c6ca9ec67d82bccfbc /src/game/PetHandler.cpp | |
| parent | fb2c984b03ebe0b0595071a689d79f5d7b4dab9e (diff) | |
| parent | b37d7ae04232fc9279e505926468c91f9e26a991 (diff) | |
*Merge with 342.
--HG--
branch : trunk
Diffstat (limited to 'src/game/PetHandler.cpp')
| -rw-r--r-- | src/game/PetHandler.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp index d912f42c22b..7950db27464 100644 --- a/src/game/PetHandler.cpp +++ b/src/game/PetHandler.cpp @@ -112,7 +112,10 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data ) return; // not let attack friendly units. - if( GetPlayer()->IsFriendlyTo(TargetUnit)) + if(GetPlayer()->IsFriendlyTo(TargetUnit)) + return; + // Not let attack through obstructions + if(!pet->IsWithinLOSInMap(TargetUnit)) return; if(pet->GetTypeId() != TYPEID_PLAYER) |