From 81e96ddaaa2a28bd968b36447e59294a1e07ddb5 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Fri, 30 Apr 2021 10:20:44 -0400 Subject: [PATCH] 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) --- Source/Game/Entities/Unit/Unit.Combat.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Game/Entities/Unit/Unit.Combat.cs b/Source/Game/Entities/Unit/Unit.Combat.cs index f3611c972..4795f39f6 100644 --- a/Source/Game/Entities/Unit/Unit.Combat.cs +++ b/Source/Game/Entities/Unit/Unit.Combat.cs @@ -1539,7 +1539,7 @@ namespace Game.Entities Spell spell = GetCurrentSpell(CurrentSpellTypes.Generic); 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); RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags.EnteringCombat);