Merge commit 'origin/master' into 310

This commit is contained in:
VladimirMangos 2009-06-09 09:51:34 +04:00
commit 05b1bda879
20 changed files with 299 additions and 38 deletions

View file

@ -245,19 +245,7 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
else
{
if(pet->HasAuraType(SPELL_AURA_MOD_POSSESS))
{
WorldPacket data(SMSG_CAST_FAILED, (4+1+1));
data << uint8(0) << uint32(spellid) << uint8(result);
switch (result)
{
case SPELL_FAILED_REQUIRES_SPELL_FOCUS:
data << uint32(spellInfo->RequiresSpellFocus);
break;
default:
break;
}
SendPacket(&data);
}
Spell::SendCastResult(GetPlayer(),spellInfo,0,result);
else
pet->SendPetCastFail(spellid, result);