From 60e9b53589f3d42e1d108c7c3eb604b2beb9e6ba Mon Sep 17 00:00:00 2001 From: blinkysc <37940565+blinkysc@users.noreply.github.com> Date: Fri, 26 Jun 2026 00:21:16 -0500 Subject: [PATCH] fix(Core/Creature): Notify creature pets when owner enters combat via assist (#25327) Co-authored-by: blinkysc --- src/server/game/Entities/Creature/Creature.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index f725f0c76..8d3612cbf 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2874,6 +2874,13 @@ void Creature::AtEngage(Unit* target) UpdateSpeed(MOVE_FLIGHT, true); } + // Notify controlled creatures (guardians/pets) so they assist when + // the owner enters combat via assist/aggro chain, not only via damage. + for (Unit* controlled : m_Controlled) + if (Creature* cControlled = controlled->ToCreature()) + if (CreatureAI* controlledAI = cControlled->AI()) + controlledAI->OwnerAttackedBy(target); + MovementGeneratorType const movetype = GetMotionMaster()->GetCurrentMovementGeneratorType(); if (movetype == WAYPOINT_MOTION_TYPE || movetype == ESCORT_MOTION_TYPE || (IsAIEnabled && AI()->IsEscorted())) {