From 2c78751b5ae2216dd7881b1a45ffd02f7ac5d703 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 30 Sep 2022 02:00:04 +0200 Subject: [PATCH] Core/Spells: Corrected implementation of SPELL_ATTR5_ALLOW_ACTIONS_DURING_CHANNEL - it allows casting other spells while channeling, not allows movement while channeling --- src/server/game/Entities/Unit/Unit.cpp | 3 ++- src/server/game/Spells/SpellMgr.cpp | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 90a22cf1a5..d06d30606e 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -2723,7 +2723,8 @@ void Unit::SetCurrentCastSpell(Spell* spell) case CURRENT_GENERIC_SPELL: { // generic spells always break channeled not delayed spells - InterruptSpell(CURRENT_CHANNELED_SPELL, false); + if (m_currentSpells[CURRENT_CHANNELED_SPELL] && !m_currentSpells[CURRENT_CHANNELED_SPELL]->GetSpellInfo()->HasAttribute(SPELL_ATTR5_ALLOW_ACTIONS_DURING_CHANNEL)) + InterruptSpell(CURRENT_CHANNELED_SPELL, false); // autorepeat breaking if (m_currentSpells[CURRENT_AUTOREPEAT_SPELL]) diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index eda2f54dcb..a09cca49d4 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -4650,12 +4650,6 @@ void SpellMgr::LoadSpellInfoCorrections() spellInfo->AttributesEx2 |= SPELL_ATTR2_NO_INITIAL_THREAT; }); - // Shadow Gale - ApplySpellFix({ 75664, 91086 }, [](SpellInfo* spellInfo) - { - spellInfo->AttributesEx5 &= ~SPELL_ATTR5_ALLOW_ACTIONS_DURING_CHANNEL; - }); - // Gronn Knockback Cosmetic ApplySpellFix({ 76138 }, [](SpellInfo* spellInfo) {