From 5553752d811247dc245ba7c88057623198a56a29 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Wed, 30 Jan 2019 18:04:44 -0800
Subject: [PATCH] fall when flying not allowed

---
 libraries/physics/src/CharacterController.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libraries/physics/src/CharacterController.cpp b/libraries/physics/src/CharacterController.cpp
index 13a1328065..27c074900f 100755
--- a/libraries/physics/src/CharacterController.cpp
+++ b/libraries/physics/src/CharacterController.cpp
@@ -672,7 +672,7 @@ void CharacterController::updateState() {
         return;
     }
     if (_pendingFlags & PENDING_FLAG_RECOMPUTE_FLYING) {
-        SET_STATE(CharacterController::State::Hover, "recomputeFlying");
+         SET_STATE(CharacterController::State::Hover, "recomputeFlying");
          _hasSupport = false;
          _stepHeight = _minStepHeight; // clears memory of last step obstacle
          _pendingFlags &= ~PENDING_FLAG_RECOMPUTE_FLYING;
@@ -784,15 +784,13 @@ void CharacterController::updateState() {
                         // Transition to hover if we are above the fall threshold
                         SET_STATE(State::Hover, "above fall threshold");
                     }
-                } else if (!rayHasHit && !_hasSupport) {
-                    SET_STATE(State::Hover, "no ground detected");
                 }
                 break;
             }
             case State::Hover:
                 btScalar horizontalSpeed = (velocity - velocity.dot(_currentUp) * _currentUp).length();
                 bool flyingFast = horizontalSpeed > (MAX_WALKING_SPEED * 0.75f);
-                if (!_flyingAllowed && rayHasHit) {
+                if (!_flyingAllowed) {
                     SET_STATE(State::InAir, "flying not allowed");
                 } else if ((_floorDistance < MIN_HOVER_HEIGHT) && !jumpButtonHeld && !flyingFast) {
                     SET_STATE(State::InAir, "near ground");