From 89d14774da3c4222f736b3526ecfc0317e1d5f81 Mon Sep 17 00:00:00 2001 From: Hondacrx Date: Sun, 7 Dec 2025 17:58:02 -0500 Subject: [PATCH] Core/Spells: Don't set CAST_FLAG_PENDING for spells that have OriginalCastID set but no triggered flag Port From (https://github.com/TrinityCore/TrinityCore/commit/aa85b278694ca36546a8ce821082aef284cd0274) --- Source/Game/Spells/Spell.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Game/Spells/Spell.cs b/Source/Game/Spells/Spell.cs index 5f286509d..192a4ea77 100644 --- a/Source/Game/Spells/Spell.cs +++ b/Source/Game/Spells/Spell.cs @@ -3939,7 +3939,7 @@ namespace Game.Spells if (schoolImmunityMask != 0 || mechanicImmunityMask != 0) castFlags |= SpellCastFlags.Immunity; - if ((IsTriggered() && !m_spellInfo.IsAutoRepeatRangedSpell()) || m_triggeredByAuraSpell != null) + if ((!m_fromClient && _triggeredCastFlags.HasAnyFlag(TriggerCastFlags.IsTriggeredMask) && !m_spellInfo.IsAutoRepeatRangedSpell()) || m_triggeredByAuraSpell != null) castFlags |= SpellCastFlags.Pending; if (m_spellInfo.HasAttribute(SpellAttr0.UsesRangedSlot) || m_spellInfo.HasAttribute(SpellAttr10.UsesRangedSlotCosmeticOnly) || m_spellInfo.HasAttribute(SpellCustomAttributes.NeedsAmmoData)) @@ -4038,7 +4038,7 @@ namespace Game.Spells SpellCastFlags castFlags = SpellCastFlags.Unk9; // triggered spells with spell visual != 0 - if ((IsTriggered() && !m_spellInfo.IsAutoRepeatRangedSpell()) || m_triggeredByAuraSpell != null) + if ((!m_fromClient && _triggeredCastFlags.HasAnyFlag(TriggerCastFlags.IsTriggeredMask) && !m_spellInfo.IsAutoRepeatRangedSpell()) || m_triggeredByAuraSpell != null) castFlags |= SpellCastFlags.Pending; if (m_spellInfo.HasAttribute(SpellAttr0.UsesRangedSlot) || m_spellInfo.HasAttribute(SpellAttr10.UsesRangedSlotCosmeticOnly) || m_spellInfo.HasAttribute(SpellCustomAttributes.NeedsAmmoData))