From 7e6727c12adb684b6b6239beb3673e694669c0db Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Thu, 5 Aug 2021 21:24:57 +0200 Subject: [PATCH] fix(Core/Spells): Forbid using charge if already charging to someone. (#7172) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixed #6453 Co-authored-by: Stefano Borzì --- src/server/game/Spells/Spell.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 088a781b9..6a472fa12 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -5647,6 +5647,11 @@ SpellCastResult Spell::CheckCast(bool strict) } case SPELL_EFFECT_CHARGE: { + if (m_caster->HasUnitState(UNIT_STATE_CHARGING)) + { + return SPELL_FAILED_DONT_REPORT; + } + if (m_spellInfo->SpellFamilyName == SPELLFAMILY_WARRIOR) { // Warbringer - can't be handled in proc system - should be done before checkcast root check and charge effect process