mirror of
https://github.com/mangosfour/server.git
synced 2025-12-14 16:37:01 +00:00
Merge branch 'master' into 303
Conflicts: src/shared/Database/DBCStores.cpp src/shared/Database/DBCfmt.cpp
This commit is contained in:
commit
93cf13acec
14 changed files with 168 additions and 467 deletions
|
|
@ -99,7 +99,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->getVictim())
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue