diff options
| author | n0n4m3 <none@none> | 2010-01-16 19:11:32 +0300 |
|---|---|---|
| committer | n0n4m3 <none@none> | 2010-01-16 19:11:32 +0300 |
| commit | 706718b28c8f028d39ec3ca7d3bfefb9f9a62add (patch) | |
| tree | 5d77bf0ad56126f028f4635096530112bd082b0a /src/game/PetHandler.cpp | |
| parent | e031df23fc77716b9e4e10cf6084d1f60ffa11ef (diff) | |
Fixed some problems with pets, port from tc1, by krz, thx Frankir.
--HG--
branch : trunk
Diffstat (limited to 'src/game/PetHandler.cpp')
| -rw-r--r-- | src/game/PetHandler.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp index edd3a9d4f2b..d35cb4867cd 100644 --- a/src/game/PetHandler.cpp +++ b/src/game/PetHandler.cpp @@ -58,6 +58,9 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data ) sLog.outError("HandlePetAction.Pet %u isn't pet of player %s.", uint32(GUID_LOPART(guid1)), GetPlayer()->GetName() ); return; } + + if (!pet->isAlive()) + return; //TODO: allow control charmed player? if(pet->GetTypeId() == TYPEID_PLAYER && !(flag == ACT_COMMAND && spellid == COMMAND_ATTACK)) |