public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-09 08:17:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Spells): Partially revert spell cancel behavior change. (#19101)

Browse Source 
Init.
This commit is contained in:
Benjamin Jackson
2024-06-20 13:16:21 -04:00
committed by GitHub
parent 3872c39aab
commit af722d4e88
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/game/Spells/Spell.cpp
View File

@@ -3710,6 +3710,7 @@ void Spell::cancel(bool bySelf)
return; return;
uint32 oldState = m_spellState; uint32 oldState = m_spellState;
bool autoRepeat = m_autoRepeat;
m_spellState = SPELL_STATE_FINISHED; m_spellState = SPELL_STATE_FINISHED;
m_autoRepeat = false; m_autoRepeat = false;
@@ -3724,9 +3725,11 @@ void Spell::cancel(bool bySelf)
} }
[[fallthrough]]; [[fallthrough]];
case SPELL_STATE_DELAYED: case SPELL_STATE_DELAYED:
SendInterrupted(SPELL_FAILED_INTERRUPTED); SendInterrupted(0);
// xinef: fixes bugged gcd reset in some cases
if (!autoRepeat)
SendCastResult(SPELL_FAILED_INTERRUPTED);
break; break;
case SPELL_STATE_CASTING: case SPELL_STATE_CASTING:
if (!bySelf) if (!bySelf)
{ {