ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(Core/Combat): Training dummy stuck combat after pet recall (#25565)

Browse source 
Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
This commit is contained in:
blinkysc 2026-04-23 17:58:16 -05:00 • committed by GitHub
parent 19855382fb
commit 0f2841ddcf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/server/scripts/World/npcs_special.cpp
View file

@ -329,6 +329,12 @@ struct npc_training_dummy : NullCreatureAI
return;
_combatTimer[attacker->GetGUID()] = 5s;
// Pet attacks engage the owner via propagation without firing
// JustEnteredCombat here, so track the owner's timer too.
if (Unit* owner = attacker->GetCharmerOrOwner())
if (me->GetCombatManager().IsInCombatWith(owner))
_combatTimer[owner->GetGUID()] = 5s;
}
void UpdateAI(uint32 diff) override