public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-07-28 18:47:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Unit): restore immediate combat engagement for non-controllable guardians (#26654)

Browse Source
This commit is contained in:
EricksOliveira
2026-07-17 07:26:29 +00:00
committed by GitHub
parent ea96cb4b4d
commit 0cb715b766
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -7425,24 +7425,27 @@ bool Unit::Attack(Unit* victim, bool meleeAttack)
else if (victim->IsCreature())
victim->ToCreature()->UpdateLeashExtensionTime();
// set position before any AI calls/assistance
//if (IsCreature())
// ToCreature()->SetCombatStartPosition(GetPositionX(), GetPositionY(), GetPositionZ());
// player-controlled creatures (pets, charms) enter combat on contact instead
// (melee swing execution or spell launch/hit, see Unit::AtTargetAttacked)
if (creature && !IsControlledByPlayer())
// Player-controlled creatures (pets, charms) enter combat on contact instead
// (melee swing execution or spell launch/hit, see Unit::AtTargetAttacked).
// Non-controllable guardians (e.g. Shaman Elementals, Infernal) have no attack
// command and must engage immediately so their AI can chase and attack.
if (creature && (!IsControlledByPlayer() || (IsGuardian() && !IsControllableGuardian())))
{
EngageWithTarget(victim);
creature->SendAIReaction(AI_REACTION_HOSTILE);
if (!IsControlledByPlayer())
{
creature->SendAIReaction(AI_REACTION_HOSTILE);
/// @todo: Implement aggro range, detection range and assistance range templates
if (!(creature->HasFlagsExtra(CREATURE_FLAG_EXTRA_DONT_CALL_ASSISTANCE)))
creature->CallAssistance();
/// @todo: Implement aggro range, detection range and assistance range templates
if (!(creature->HasFlagsExtra(CREATURE_FLAG_EXTRA_DONT_CALL_ASSISTANCE)))
creature->CallAssistance();
creature->SetAssistanceTimer(sWorld->getIntConfig(CONFIG_CREATURE_FAMILY_ASSISTANCE_PERIOD));
creature->SetAssistanceTimer(sWorld->getIntConfig(CONFIG_CREATURE_FAMILY_ASSISTANCE_PERIOD));
SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
}
}
// delay offhand weapon attack by 50% of the base attack time