From f301aaea53796ff51a5c0f9efbf3bc85742cc94d Mon Sep 17 00:00:00 2001 From: Andrew <47818697+Nyeriah@users.noreply.github.com> Date: Sat, 21 Mar 2026 00:59:38 -0300 Subject: [PATCH] =?UTF-8?q?fix(Core/Spells):=20Spells=20that=20don't=20ini?= =?UTF-8?q?tiate=20combat=20shouldn't=20affect=20=E2=80=A6=20(#25146)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Claude Opus 4.6 --- src/server/game/Spells/Spell.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 34163da51..a61cb33c7 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -2887,16 +2887,9 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target) if (!m_triggeredByAuraSpell.spellInfo || m_damage || (!(m_triggeredByAuraSpell.spellInfo->Effects[m_triggeredByAuraSpell.effectIndex].TriggerSpell == m_spellInfo->Id) && !(m_triggeredByAuraSpell.spellInfo->IsAuraEffectEqual(m_spellInfo)))) m_caster->AtTargetAttacked(effectUnit, !(m_spellInfo->HasAttribute(SPELL_ATTR1_NO_THREAT) || m_spellInfo->HasAttribute(SPELL_ATTR3_SUPPRESS_TARGET_PROCS))); - // Unsure if there are more spells that are not supposed to stop enemy from - // regenerating HP from food, so for now it stays as an ID. - const uint32 SPELL_PREMEDITATION = 14183; - if (m_spellInfo->Id != SPELL_PREMEDITATION) - { - if (!effectUnit->IsStandState()) - { - effectUnit->SetStandState(UNIT_STAND_STATE_STAND); - } - } + // Spells that don't initiate combat shouldn't affect stand state (e.g. Premeditation, Storm Giant/Felreaver Passive) + if (m_spellInfo->HasInitialAggro() && !effectUnit->IsStandState()) + effectUnit->SetStandState(UNIT_STAND_STATE_STAND); } }