Merge branch 'master' into Playerbot

This commit is contained in:
郑佩茹
2023-02-17 11:37:31 -07:00
417 changed files with 3381 additions and 903 deletions

View File

@@ -13692,7 +13692,7 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy, uint32 duration)
if (enemy)
{
if (IsAIEnabled)
creature->AI()->EnterCombat(enemy);
creature->AI()->JustEngagedWith(enemy);
if (creature->GetFormation())
creature->GetFormation()->MemberEngagingTarget(creature, enemy);