Core/Spells: Cleanup movement checks in spells - use correct interrupt flags

Port From (https://github.com/TrinityCore/TrinityCore/commit/538fa8e97ff4b4e36a59e37fd74ea8958e6e30d2)
2022-06-01 16:20:48 -04:00
parent c27b817789
commit e9fcfd6f26
4 changed files with 41 additions and 40 deletions
@@ -1563,8 +1563,7 @@ namespace Game.Entities

            // check "realtime" interrupts
            // don't cancel spells which are affected by a SPELL_AURA_CAST_WHILE_WALKING effect
-            if (((IsTypeId(TypeId.Player) && ToPlayer().IsMoving()) || IsNonMeleeSpellCast(false, false, true, autoRepeatSpellInfo.Id == 75)) &&
-                !CanCastSpellWhileMoving(autoRepeatSpellInfo))
+            if ((IsMoving() && GetCurrentSpell(CurrentSpellTypes.AutoRepeat).CheckMovement() != SpellCastResult.SpellCastOk) || IsNonMeleeSpellCast(false, false, true, autoRepeatSpellInfo.Id == 75))
            {
                // cancel wand shoot
                if (autoRepeatSpellInfo.Id != 75)