From 0de5fbb6c0aee0ef7fd7750dd8246f6ae576bc83 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) (cherry picked from commit a891eb364e941a5146fba4af16e1ecf65cdd9239) --- 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 b1486b6b2cf..42a17fd2c73 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -5482,7 +5482,7 @@ bool Unit::Attack(Unit* victim, bool meleeAttack) //if (GetTypeId() == TYPEID_UNIT) // ToCreature()->SetCombatStartPosition(GetPositionX(), GetPositionY(), GetPositionZ()); - if (creature && !IsPet()) + if (creature && !IsControlledByPlayer()) { EngageWithTarget(victim); // ensure that anything we're attacking has threat