aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeader <keader.android@gmail.com>2018-03-11 09:23:23 -0300
committerTreeston <treeston.mmoc@gmail.com>2018-03-11 13:23:23 +0100
commita891eb364e941a5146fba4af16e1ecf65cdd9239 (patch)
treeceed1eb6459474d1d560adde7a7d572e8114bb43
parent43491ba7f45049618b61b8f6e72788a437d82edc (diff)
Core/Unit: Guardians no longer enter combat before reaching the target (#19816)
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 50d17b5ae72..01f9dcea6c2 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -5547,7 +5547,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