aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormik1893 <michele.roscelli@gmail.com>2016-08-21 11:32:42 +0200
committerShauren <shauren.trinity@gmail.com>2016-08-21 11:32:42 +0200
commit6d07fbf07c9f1387644d8ec0c1905edc838b1273 (patch)
treee13ba31b6838afc3bd540a7a0889dfc9de3fa408 /src
parent6f85422f0b7221dd38eaa70320b8a28b5fe7a2ef (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
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Spells/Spell.cpp2
1 files changed, 1 insertions, 1 deletions
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)