From 42e0a6f1f70d7f82c9bbd4dd66dafdc849c3485f Mon Sep 17 00:00:00 2001 From: Giacomo Pozzoni Date: Mon, 30 Dec 2019 18:50:43 +0100 Subject: [PATCH] Core/Movement: Fix stunned falling units freezing the client --- src/server/game/Movement/MotionMaster.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index 99c18d25503..95f7860a788 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -584,7 +584,7 @@ void MotionMaster::MoveFall(uint32 id /*=0*/) return; // rooted units don't move (also setting falling+root flag causes client freezes) - if (_owner->HasUnitState(UNIT_STATE_ROOT)) + if (_owner->HasUnitState(UNIT_STATE_ROOT | UNIT_STATE_STUNNED)) return; _owner->AddUnitMovementFlag(MOVEMENTFLAG_FALLING);