diff options
| author | jackpoz <giacomopoz@gmail.com> | 2014-12-08 21:09:18 +0100 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2014-12-08 21:09:18 +0100 |
| commit | ce5226dc55d315f932bf63ddd7ba74641bfba1c9 (patch) | |
| tree | aad47797d84fe901a695fdafcf84e017ea474bab /src | |
| parent | 0bad99626bb29b09ee387625765b4b62e39158a0 (diff) | |
| parent | 54cc8adac5db101f427b76373ce79d587f7e5332 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 311182291c5..e85fbba104b 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -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; |