From 090acddee341f389585db8146afcae8f529d77ff Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 11 Nov 2010 22:53:52 +0100 Subject: Core/Spells: Fixed Heart of the Phoenix pet spell Closes issue #3911. --HG-- branch : trunk --- src/server/game/Server/Protocol/Handlers/PetHandler.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/server/game') diff --git a/src/server/game/Server/Protocol/Handlers/PetHandler.cpp b/src/server/game/Server/Protocol/Handlers/PetHandler.cpp index 01fda02dc3b..c0c4fc4b993 100755 --- a/src/server/game/Server/Protocol/Handlers/PetHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/PetHandler.cpp @@ -80,7 +80,13 @@ void WorldSession::HandlePetAction(WorldPacket & recv_data) } if (!pet->isAlive()) - return; + { + SpellEntry const* spell = (flag == ACT_ENABLED || flag == ACT_PASSIVE) ? sSpellStore.LookupEntry(spellid) : NULL; + if (!spell) + return; + if (!(spell->Attributes & SPELL_ATTR_CASTABLE_WHILE_DEAD)) + return; + } //TODO: allow control charmed player? if (pet->GetTypeId() == TYPEID_PLAYER && !(flag == ACT_COMMAND && spellid == COMMAND_ATTACK)) -- cgit v1.2.3