diff options
| author | mik1893 <michele.roscelli@gmail.com> | 2016-08-21 11:32:42 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-02-12 17:04:08 +0100 |
| commit | 0536c9d969c8f436792634a909650c45e7873d96 (patch) | |
| tree | 8bab06359927ad394a1fa871830bdc270dc445ac /src | |
| parent | 8b7934f7185069cf851d09adcd5abd1b11be74bd (diff) | |
Core/Spells: Fixed spells like Shadowform, Tricks of the Trade, Misdirection getting stuck in unusable state clientside if they failed earlier because of GCD
Closes #657
Closes #12913
Closes #17376
(cherry picked from commit 6d07fbf07c9f1387644d8ec0c1905edc838b1273)
Typo fix
(cherry picked from commit 39311e0ce86c13afae502d2c95b468d17bad384a)
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 1b6990aef13..8e8041360ac 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -4768,7 +4768,7 @@ SpellCastResult Spell::CheckCast(bool strict) // Check global cooldown if (strict && !(_triggeredCastFlags & TRIGGERED_IGNORE_GCD) && HasGlobalCooldown()) - return SPELL_FAILED_NOT_READY; + return !m_spellInfo->HasAttribute(SPELL_ATTR0_DISABLED_WHILE_ACTIVE) ? SPELL_FAILED_NOT_READY : SPELL_FAILED_DONT_REPORT; // only triggered spells can be processed an ended battleground if (!IsTriggered() && m_caster->GetTypeId() == TYPEID_PLAYER) |