Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 08:55:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Fixed Heart of the Phoenix pet spell

Browse Source 
Closes issue #3911.

--HG--
branch : trunk
This commit is contained in:
Shauren
2010-11-11 22:53:52 +01:00
parent 0f9279b7ef
commit 090acddee3
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/game/Server/Protocol/Handlers/PetHandler.cpp
View File

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

5
src/server/scripts/Spells/spell_hunter.cpp
View File

@@ -419,9 +419,10 @@ public:
void HandleScript(SpellEffIndex /*effIndex*/)
{
Unit *caster = GetCaster();
if (caster->HasAura(HUNTER_PET_HEART_OF_THE_PHOENIX_DEBUFF))
Unit *owner = caster->GetOwner();
if (!owner || caster->HasAura(HUNTER_PET_HEART_OF_THE_PHOENIX_DEBUFF))
return;
caster->CastCustomSpell(HUNTER_PET_HEART_OF_THE_PHOENIX_TRIGGERED, SPELLVALUE_BASE_POINT0, 100, caster, true);
owner->CastCustomSpell(HUNTER_PET_HEART_OF_THE_PHOENIX_TRIGGERED, SPELLVALUE_BASE_POINT0, 100, caster, true);
caster->CastSpell(caster, HUNTER_PET_HEART_OF_THE_PHOENIX_DEBUFF, true);
}