From 41b76ef20358b4e1251fe178c3e87bc6049a6649 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 8 Sep 2021 23:37:19 -0400 Subject: [PATCH] Core/Unit: Guardians no longer enter combat before reaching the target Port From (https://github.com/TrinityCore/TrinityCore/commit/0de5fbb6c0aee0ef7fd7750dd8246f6ae576bc83) --- Source/Game/Entities/Unit/Unit.Combat.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Game/Entities/Unit/Unit.Combat.cs b/Source/Game/Entities/Unit/Unit.Combat.cs index ad1dec479..00338e83a 100644 --- a/Source/Game/Entities/Unit/Unit.Combat.cs +++ b/Source/Game/Entities/Unit/Unit.Combat.cs @@ -328,7 +328,7 @@ namespace Game.Entities if (meleeAttack) AddUnitState(UnitState.MeleeAttacking); - if (creature != null && !IsPet()) + if (creature != null && !IsControlledByPlayer()) { EngageWithTarget(victim); // ensure that anything we're attacking has threat