From 63bc405faeb7afcf99de6f7531e4ea59065165f4 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 3 Jun 2024 19:42:50 +0200 Subject: Core/Spells: Don't send SMSG_CAST_FAILED for interrupted spells after they were launched or channelling was started (this clears cooldown on client) Closes #26077 --- src/server/game/Spells/Spell.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index a398fe55343..1f4504ad3e4 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -3249,8 +3249,7 @@ void Spell::cancel() CancelGlobalCooldown(); [[fallthrough]]; case SPELL_STATE_DELAYED: - SendInterrupted(0); - SendCastResult(SPELL_FAILED_INTERRUPTED); + SendInterrupted(SPELL_FAILED_INTERRUPTED); break; case SPELL_STATE_CASTING: @@ -3260,8 +3259,7 @@ void Spell::cancel() unit->RemoveOwnedAura(m_spellInfo->Id, m_originalCasterGUID, 0, AURA_REMOVE_BY_CANCEL); SendChannelUpdate(0); - SendInterrupted(0); - SendCastResult(SPELL_FAILED_INTERRUPTED); + SendInterrupted(SPELL_FAILED_INTERRUPTED); m_appliedMods.clear(); break; -- cgit v1.2.3