Merge pull request #13558 from MrSmite/3.3.5

Fix spell cooldown for guardian pets
Fixes https://github.com/TrinityCore/TrinityCore/issues/13450 , closes https://github.com/TrinityCore/TrinityCore/pull/13452 and https://github.com/TrinityCore/TrinityCore/pull/13558
This commit is contained in:
jackpoz committed 2014-12-08 21:09:18 +01:00
commit ce5226dc55
1 file changed
+1 -1
+1 -1
View File
@@ -3438,7 +3438,7 @@ void Spell::SendSpellCooldown()
{
// Handle pet cooldowns here if needed instead of in PetAI to avoid hidden cooldown restarts
Creature* _creature = m_caster->ToCreature();
if (_creature && _creature->IsPet())
if (_creature && (_creature->IsPet() || _creature->IsGuardian()))
_creature->AddCreatureSpellCooldown(m_spellInfo->Id);
return;