From 6d07fbf07c9f1387644d8ec0c1905edc838b1273 Mon Sep 17 00:00:00 2001 From: mik1893 Date: Sun, 21 Aug 2016 11:32:42 +0200 Subject: 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 --- src/server/game/Spells/Spell.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/game') diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 45dcb6d9d17..ca33f4acc1a 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -4749,7 +4749,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) -- cgit v1.2.3