From a47b2baa590a316a66563e79412d650a1c6cada3 Mon Sep 17 00:00:00 2001 From: blinkysc <37940565+blinkysc@users.noreply.github.com> Date: Tue, 14 Jul 2026 20:25:45 -0400 Subject: [PATCH] fix(Core/Spell): restore Feign Death threat split outside boss encounters (#26327) Co-authored-by: blinkysc --- src/server/game/Spells/Auras/SpellAuraEffects.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 9c4fa8fe8..2ea95ae4b 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -2989,7 +2989,7 @@ void AuraEffect::HandleFeignDeath(AuraApplication const* aurApp, uint8 mode, boo for (auto& pair : target->GetThreatMgr().GetThreatenedByMeList()) pair.second->ScaleThreat(0.0f); - if (target->GetMap()->IsDungeon()) // feign death does not remove combat in dungeons + if (target->GetInstanceScript() && target->GetInstanceScript()->IsEncounterInProgress()) { target->AttackStop(); if (Player* targetPlayer = target->ToPlayer())