Core/Spells: Only interrupt spells with interrupt flag Combat when spell also has SPELL_ATTR0_CANT_USED_IN_COMBAT attribute
Port From (https://github.com/TrinityCore/TrinityCore/commit/8e6821648b96e4ae8e495b1adc0c15855eea9633)
This commit is contained in:
@@ -1539,7 +1539,7 @@ namespace Game.Entities
|
|||||||
|
|
||||||
Spell spell = GetCurrentSpell(CurrentSpellTypes.Generic);
|
Spell spell = GetCurrentSpell(CurrentSpellTypes.Generic);
|
||||||
if (spell != null)
|
if (spell != null)
|
||||||
if (spell.GetState() == SpellState.Preparing && spell.m_spellInfo.InterruptFlags.HasAnyFlag(SpellInterruptFlags.Combat))
|
if (spell.GetState() == SpellState.Preparing && spell.m_spellInfo.HasAttribute(SpellAttr0.CantUsedInCombat) && spell.m_spellInfo.InterruptFlags.HasAnyFlag(SpellInterruptFlags.Combat))
|
||||||
InterruptNonMeleeSpells(false);
|
InterruptNonMeleeSpells(false);
|
||||||
|
|
||||||
RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags.EnteringCombat);
|
RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags.EnteringCombat);
|
||||||
|
|||||||
Reference in New Issue
Block a user