aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKeader <keader.android@gmail.com>2018-03-11 09:23:23 -0300
committerShauren <shauren.trinity@gmail.com>2021-09-06 15:23:29 +0200
commit0de5fbb6c0aee0ef7fd7750dd8246f6ae576bc83 (patch)
tree75bc469033c8a26f1d6f0d5b97eea389e141caed /src
parenta88cf958b0bc714030e2d577fda2f0b3a56cc35c (diff)
Core/Unit: Guardians no longer enter combat before reaching the target (#19816)
(cherry picked from commit a891eb364e941a5146fba4af16e1ecf65cdd9239)
Diffstat (limited to 'src')
-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 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