From 096269349cd82a44f57f36b17dfe4e5e32a39f9a Mon Sep 17 00:00:00 2001 From: Treeston Date: Wed, 3 Jul 2019 19:26:43 +0200 Subject: Entities/Player: Fix an edge case where overlapping CCs could prevent player movement from being re-enabled. f6f1c48 follow-up. (cherry picked from commit 4e767f1c7cd0cae6316982e38be66f560baafea5) --- src/server/game/Entities/Player/Player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 153ee80e18d..a9e5d37a1d7 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -25762,7 +25762,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; WorldPackets::Movement::ControlUpdate data; -- cgit v1.2.3