Skip to content

fix(Core/Scripts): Fix DK Gargoyle not resuming attack after CC #25318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blinkysc wants to merge 2 commits into
base: master
Choose a base branch
from
+30 −0
Open

fix(Core/Scripts): Fix DK Gargoyle not resuming attack after CC #25318

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af29c15
fix(Core/Scripts): Fix DK Gargoyle not resuming attack after CC
blinkysc Mar 30, 2026
f6dd9b9
fix(Core/Scripts): Fix Army of the Dead not resuming attack after CC
blinkysc Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions src/server/scripts/Pet/pet_dk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,16 @@ struct npc_pet_dk_ebon_gargoyle : ScriptedAI
_decisionTimer -= diff;
if (!UpdateVictimWithGaze())
{
// Re-engage if we still have a valid victim but lost engagement
// (e.g., PvP combat reference expired during CC like Cyclone)
if (Unit* victim = me->GetVictim())
{
if (me->IsValidAttackTarget(victim))
{
me->EngageWithTarget(victim);
return;
}
}
MySelectNextTarget();
return;
}
Expand Down Expand Up @@ -356,6 +366,26 @@ struct npc_pet_dk_army_of_the_dead : public AggressorAI
if (me->IsValidAttackTarget(attacker))
AttackStart(attacker);
}

void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
{
// Re-engage if we still have a valid victim but lost engagement
// (e.g., combat reference expired during CC like knockback)
if (Unit* victim = me->GetVictim())
{
if (me->IsValidAttackTarget(victim))
{
me->EngageWithTarget(victim);
return;
}
}
return;
}

DoMeleeAttackIfReady();
}
};

struct npc_pet_dk_dancing_rune_weapon : public NullCreatureAI
Expand Down
Loading