diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 31577d604..b0ba39521 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -18196,6 +18196,11 @@ void Unit::SetControlled(bool apply, UnitState state) void Unit::SetStunned(bool apply) { + if (HasUnitState(UNIT_STATE_IN_FLIGHT)) + { + return; + } + if (apply) { SetTarget();