diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-01-22 22:11:11 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-01-22 22:14:28 +0100 |
| commit | 3f886025a2559c4973ac260fc633ff74c2096932 (patch) | |
| tree | 652b90d9bbb2444032dfe7ea4e3a7106640a0fd1 /src/server/game/Spells/Spell.cpp | |
| parent | 1038df8d5b522e1e959528c3b7c17c01a88e7759 (diff) | |
Core/Spells: Ignore category cooldowns for triggered spells.
* This fixes weird issues where triggered spell fails because it has the same category as the spell triggering it
Closes #15794
Closes #15048
(cherry picked from commit 044edced9a5b8f0a53640bfea4727eb9d38eae7f)
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -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 84bff4a69d6..63fe148dd93 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -4701,7 +4701,7 @@ SpellCastResult Spell::CheckCast(bool strict) return SPELL_FAILED_NOT_READY; } - if (!m_caster->GetSpellHistory()->IsReady(m_spellInfo, m_castItemEntry)) + if (!m_caster->GetSpellHistory()->IsReady(m_spellInfo, m_castItemEntry, IsIgnoringCooldowns())) { if (m_triggeredByAuraSpell) return SPELL_FAILED_DONT_REPORT; |