Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: make Spell::CheckMovement respect the current spell state (#28315)

Browse Source
This commit is contained in:
Ovah
2022-10-03 15:52:49 +02:00
committed by GitHub
parent 769591c99e
commit ad2df01b2c
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6860,17 +6860,15 @@ SpellCastResult Spell::CheckMovement() const
{
if (!unitCaster->CanCastSpellWhileMoving(m_spellInfo))
{
if (m_casttime)
if (getState() == SPELL_STATE_PREPARING)
{
if (m_spellInfo->InterruptFlags.HasFlag(SpellInterruptFlags::Movement))
return SPELL_FAILED_MOVING;
if (m_casttime > 0)
if (m_spellInfo->InterruptFlags.HasFlag(SpellInterruptFlags::Movement))
return SPELL_FAILED_MOVING;
}
else
{
// only fail channeled casts if they are instant but cannot be channeled while moving
if (m_spellInfo->IsChanneled() && !m_spellInfo->IsMoveAllowedChannel())
else if (getState() == SPELL_STATE_CASTING)
if (!m_spellInfo->IsMoveAllowedChannel())
return SPELL_FAILED_MOVING;
}
}
}