From 6da3663547e7502650acfa283ece4f48a869f432 Mon Sep 17 00:00:00 2001 From: Keader Date: Sun, 11 Mar 2018 09:23:23 -0300 Subject: [PATCH] Core/Unit: Guardians no longer enter combat before reaching the target (#19816) --- src/server/game/Entities/Unit/Unit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 7f101ee003..757a219462 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -5533,7 +5533,7 @@ bool Unit::Attack(Unit* victim, bool meleeAttack) //if (GetTypeId() == TYPEID_UNIT) // ToCreature()->SetCombatStartPosition(GetPositionX(), GetPositionY(), GetPositionZ()); - if (creature && !IsPet()) + if (creature && !IsControlledByPlayer()) { // should not let player enter combat by right clicking target - doesn't helps AddThreat(victim, 0.0f);