From 1e17eaae0bedc5e03a6b7c5c3792f5c04742b71d Mon Sep 17 00:00:00 2001 From: Skjalf <47818697+Nyeriah@users.noreply.github.com> Date: Sun, 12 Feb 2023 08:28:18 -0300 Subject: [PATCH] fix(Core/SAI): Set minions in combat with their master's victim (#14959) --- src/server/game/AI/SmartScripts/SmartAI.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 05d311de6..942041d08 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -811,6 +811,20 @@ void SmartAI::JustSummoned(Creature* creature) { GetScript()->ProcessEventsFor(SMART_EVENT_SUMMONED_UNIT, creature); GetScript()->AddCreatureSummon(creature->GetGUID()); + + if (me->IsEngaged() && !creature->IsInEvadeMode()) + { + if (Unit* victim = me->GetVictim()) + { + creature->SetInCombatWith(victim); + victim->SetInCombatWith(creature); + + if (creature->CanHaveThreatList()) + { + creature->AddThreat(victim, 0.0f); + } + } + } } void SmartAI::SummonedCreatureDies(Creature* summon, Unit* /*killer*/)