From d294d7e284b74e9c9f16600371cf87b163546b34 Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Sun, 17 Sep 2017 23:16:49 +0000
Subject: [PATCH] Fix possible fall damage when switching from falling to
 flying

---
 apps/openmw/mwmechanics/character.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 75ecf00a81..cd14ec5a4f 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1754,7 +1754,7 @@ void CharacterController::update(float duration)
                 }
             }
         }
-        else if(mJumpState == JumpState_InAir && !inwater)
+        else if(mJumpState == JumpState_InAir && !inwater && !flying)
         {
             forcestateupdate = true;
             jumpstate = JumpState_Landing;