aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2019-07-03 19:26:43 +0200
committerTreeston <treeston.mmoc@gmail.com>2019-07-03 19:26:43 +0200
commit4e767f1c7cd0cae6316982e38be66f560baafea5 (patch)
treeb6db51857c92d2ad8991616024441f95da7d20a9 /src
parentcc5088369b43f25f68443e1018e994694158c2c2 (diff)
Entities/Player: Fix an edge case where overlapping CCs could prevent player movement from being re-enabled. f6f1c48 follow-up.
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Player/Player.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index a5f80989f96..49463685987 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -23882,7 +23882,7 @@ void Player::SetClientControl(Unit* target, bool allowMove)
}
// still affected by some aura that shouldn't allow control, only allow on last such aura to be removed
- if (target->HasUnitState(UNIT_STATE_CONTROLLED))
+ if (target->HasUnitState(UNIT_STATE_FLEEING | UNIT_STATE_CONFUSED))
allowMove = false;
WorldPacket data(SMSG_CLIENT_CONTROL_UPDATE, target->GetPackGUID().size()+1);