Core/Spells: Merge TRIGGERED_IGNORE_AURA_INTERRUPT_FLAGS functionality into TRIGGERED_IGNORE_CAST_IN_PROGRESS as they are always used together (and missing one of them in scripts is a common enough mistake)
Port From (https://github.com/TrinityCore/TrinityCore/commit/ca16d0800c281e87b309c3b695f67c40d5b1d0f8)
This commit is contained in:
@@ -1537,10 +1537,10 @@ namespace Framework.Constants
|
||||
IgnoreCastInProgress = 0x20, //! Will Not Check If A Current Cast Is In Progress
|
||||
// reuse = 0x40, //
|
||||
CastDirectly = 0x80, //! In Spell.Prepare, Will Be Cast Directly Without Setting Containers For Executed Spell
|
||||
IgnoreAuraInterruptFlags = 0x100, //! Will Ignore Interruptible Aura'S At Cast
|
||||
// reuse = 0x100, //
|
||||
IgnoreSetFacing = 0x200, //! Will Not Adjust Facing To Target (If Any)
|
||||
IgnoreShapeshift = 0x400, //! Will Ignore Shapeshift Checks
|
||||
// reuse
|
||||
// reuse = 0x800, //
|
||||
DisallowProcEvents = 0x1000, //! Disallows proc events from triggered spell (default)
|
||||
IgnoreCasterMountedOrOnVehicle = 0x2000, //! Will Ignore Mounted/On Vehicle Restrictions
|
||||
// reuse = 0x4000,
|
||||
|
||||
@@ -2629,7 +2629,7 @@ namespace Game.Spells
|
||||
{
|
||||
// stealth must be removed at cast starting (at show channel bar)
|
||||
// skip triggered spell (item equip spell casting and other not explicit character casts/item uses)
|
||||
if (!_triggeredCastFlags.HasAnyFlag(TriggerCastFlags.IgnoreAuraInterruptFlags) && !m_spellInfo.HasAttribute(SpellAttr2.NotAnAction))
|
||||
if (!_triggeredCastFlags.HasAnyFlag(TriggerCastFlags.IgnoreCastInProgress) && !m_spellInfo.HasAttribute(SpellAttr2.NotAnAction))
|
||||
unitCaster.RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags.Action, m_spellInfo);
|
||||
|
||||
// Do not register as current spell when requested to ignore cast in progress
|
||||
@@ -3044,7 +3044,7 @@ namespace Game.Spells
|
||||
if (!hitMask.HasAnyFlag(ProcFlagsHit.Critical))
|
||||
hitMask |= ProcFlagsHit.Normal;
|
||||
|
||||
if (!_triggeredCastFlags.HasAnyFlag(TriggerCastFlags.IgnoreAuraInterruptFlags) && !m_spellInfo.HasAttribute(SpellAttr2.NotAnAction))
|
||||
if (!_triggeredCastFlags.HasAnyFlag(TriggerCastFlags.IgnoreCastInProgress) && !m_spellInfo.HasAttribute(SpellAttr2.NotAnAction))
|
||||
m_originalCaster.RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags.ActionDelayed, m_spellInfo);
|
||||
|
||||
if (!m_spellInfo.HasAttribute(SpellAttr3.SuppressCasterProcs))
|
||||
|
||||
Reference in New Issue
Block a user