Merge branch 'master' into 303

Conflicts:
	src/shared/Database/DBCStores.cpp
	src/shared/Database/DBCfmt.cpp
This commit is contained in:
tomrus88 2008-11-28 07:20:02 +03:00
commit 93cf13acec
14 changed files with 168 additions and 467 deletions

View file

@ -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())