sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Core/Combat): Restore pet/owner combat propagation (#25166)

Browse Source 
Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
This commit is contained in:
blinkysc
2026-03-22 12:39:34 -05:00
committed by GitHub
parent d31e58d237
commit 9e666623c3
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/AI/CreatureAI.cpp
+1 -1
View File
@@ -199,7 +199,7 @@ void CreatureAI::OnOwnerCombatInteraction(Unit* target)
return; return;
if (!me->HasReactState(REACT_PASSIVE) && me->CanStartAttack(target, true)) if (!me->HasReactState(REACT_PASSIVE) && me->CanStartAttack(target, true))
me->EngageWithTarget(target); AttackStart(target);
} }
// Distract creature, if player gets too close while stealthed/prowling // Distract creature, if player gets too close while stealthed/prowling
src/server/game/Entities/Unit/Unit.cpp
+2
View File
@@ -11392,6 +11392,8 @@ void Unit::AtTargetAttacked(Unit* target, bool canInitialAggro)
target->EngageWithTarget(this); target->EngageWithTarget(this);
if (Unit* targetOwner = target->GetCharmerOrOwner()) if (Unit* targetOwner = target->GetCharmerOrOwner())
targetOwner->EngageWithTarget(this); targetOwner->EngageWithTarget(this);
if (Unit* myOwner = GetCharmerOrOwner())
target->EngageWithTarget(myOwner);
// Patch 3.0.8: All player spells which cause a creature to become aggressive // Patch 3.0.8: All player spells which cause a creature to become aggressive
// to you will now also immediately cause the creature to be tapped. // to you will now also immediately cause the creature to be tapped.