nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-15 18:10:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Unit): Improve pets behavior (#7836)

Browse Source
This commit is contained in:
patou01
2021-09-16 10:27:28 +02:00
committed by GitHub
parent 8751c68497
commit 10ad759653
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12734,7 +12734,33 @@ void Unit::CombatStart(Unit* target, bool initialAggro)
if (target->IsPet())
target->ToCreature()->AI()->AttackedBy(this); // PetAI has special handler before AttackStart()
else
{
target->ToCreature()->AI()->AttackStart(this);
// if the target is an NPC with a pet or minion, pet should react.
if (Unit* targetControlledUnit = target->GetFirstControlled())
{
targetControlledUnit->SetInCombatWith(this);
SetInCombatWith(targetControlledUnit);
targetControlledUnit->AddThreat(this, 0.0f);
}
}
// if unit has an owner, put owner in combat.
if (Unit* targetOwner = target->GetOwner())
{
if (!(targetOwner->IsInCombatWith(this)))
{
/* warding off to not take over aggro for no reason
Using only AddThreat causes delay in attack */
if (!targetOwner->IsInCombat() && targetOwner->IsAIEnabled)
{
targetOwner->ToCreature()->AI()->AttackStart(this);
}
targetOwner->SetInCombatWith(this);
SetInCombatWith(targetOwner);
targetOwner->AddThreat(this, 0.0f);
}
}
}
SetInCombatWith(target);