From 68b5bf1ca2cd4c27c6a20a472cd239c2741f2d95 Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Sat, 8 Aug 2020 17:05:48 -0400
Subject: [PATCH] state corrections

---
 common/src/states/climb.rs | 3 ++-
 common/src/states/glide.rs | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/src/states/climb.rs b/common/src/states/climb.rs
index 44642ec656..4bf3cf71b2 100644
--- a/common/src/states/climb.rs
+++ b/common/src/states/climb.rs
@@ -87,7 +87,8 @@ impl CharacterBehavior for Data {
                 },
                 Climb::Hold => {
                     // Antigrav
-                    update.vel.0.z = (update.vel.0.z + data.dt.0 * GRAVITY * 1.1).min(CLIMB_SPEED);
+                    update.vel.0.z =
+                        (update.vel.0.z + data.dt.0 * GRAVITY * 1.075).min(CLIMB_SPEED);
                     update.vel.0 = Lerp::lerp(
                         update.vel.0,
                         Vec3::zero(),
diff --git a/common/src/states/glide.rs b/common/src/states/glide.rs
index c8c06b68be..93449a2ad3 100644
--- a/common/src/states/glide.rs
+++ b/common/src/states/glide.rs
@@ -24,7 +24,9 @@ impl CharacterBehavior for Data {
             update.character = CharacterState::GlideWield;
             return update;
         }
-
+        if data.physics.in_fluid {
+            update.character = CharacterState::Idle;
+        }
         // If there is a wall in front of character and they are trying to climb go to
         // climb
         handle_climb(&data, &mut update);