Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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)

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/ca16d0800c281e87b309c3b695f67c40d5b1d0f8)
This commit is contained in:
hondacrx
2023-09-14 07:04:22 -04:00
parent 76c928cd2c
commit 5da5fb1e31
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/Spells/SpellConst.cs
+2 -2
View File
@@ -1537,10 +1537,10 @@ namespace Framework.Constants
IgnoreCastInProgress = 0x20, //! Will Not Check If A Current Cast Is In Progress IgnoreCastInProgress = 0x20, //! Will Not Check If A Current Cast Is In Progress
// reuse = 0x40, // // reuse = 0x40, //
CastDirectly = 0x80, //! In Spell.Prepare, Will Be Cast Directly Without Setting Containers For Executed Spell 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) IgnoreSetFacing = 0x200, //! Will Not Adjust Facing To Target (If Any)
IgnoreShapeshift = 0x400, //! Will Ignore Shapeshift Checks IgnoreShapeshift = 0x400, //! Will Ignore Shapeshift Checks
// reuse // reuse = 0x800, //
DisallowProcEvents = 0x1000, //! Disallows proc events from triggered spell (default) DisallowProcEvents = 0x1000, //! Disallows proc events from triggered spell (default)
IgnoreCasterMountedOrOnVehicle = 0x2000, //! Will Ignore Mounted/On Vehicle Restrictions IgnoreCasterMountedOrOnVehicle = 0x2000, //! Will Ignore Mounted/On Vehicle Restrictions
// reuse = 0x4000, // reuse = 0x4000,
Source/Game/Spells/Spell.cs
+2 -2
View File
@@ -2629,7 +2629,7 @@ namespace Game.Spells
{ {
// stealth must be removed at cast starting (at show channel bar) // 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) // 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); unitCaster.RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags.Action, m_spellInfo);
// Do not register as current spell when requested to ignore cast in progress // 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)) if (!hitMask.HasAnyFlag(ProcFlagsHit.Critical))
hitMask |= ProcFlagsHit.Normal; 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); m_originalCaster.RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags.ActionDelayed, m_spellInfo);
if (!m_spellInfo.HasAttribute(SpellAttr3.SuppressCasterProcs)) if (!m_spellInfo.HasAttribute(SpellAttr3.SuppressCasterProcs))