From c8743158acf1f2c9e47d85e73cf5923f42c7933d Mon Sep 17 00:00:00 2001
From: SDraw <sdraw@protonmail.com>
Date: Sat, 6 Jan 2024 14:04:43 +0300
Subject: [PATCH] Fall detection fix

---
 ml_prm/RagdollController.cs | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/ml_prm/RagdollController.cs b/ml_prm/RagdollController.cs
index 1f4cff1..93a31fb 100644
--- a/ml_prm/RagdollController.cs
+++ b/ml_prm/RagdollController.cs
@@ -136,14 +136,15 @@ namespace ml_prm
             if(m_avatarReady && !m_enabled && Settings.FallDamage && !MovementSystem.Instance.flying)
             {
                 bool l_grounded = MovementSystem.Instance.IsGroundedRaw();
-                if(m_inAir && l_grounded && (m_inAirDistance > Settings.FallLimit))
+                bool l_inWater = MovementSystem.Instance.GetSubmerged();
+                if(m_inAir && l_grounded && !l_inWater && (m_inAirDistance > Settings.FallLimit))
                 {
                     m_inAirDistance = 0f;
                     SwitchRagdoll();
                 }
 
-                m_inAir = !l_grounded;
-                if(l_grounded)
+                m_inAir = !(l_grounded || l_inWater);
+                if(!m_inAir)
                     m_inAirDistance = 0f;
             }
 
@@ -435,11 +436,12 @@ namespace ml_prm
             if(m_avatarReady && m_enabled)
                 SwitchRagdoll();
 
+            ResetStates();
+
             OnGravityChange(Settings.Gravity);
             OnPhysicsMaterialChange(true);
             OnMovementDragChange(Settings.MovementDrag);
             OnBuoyancyChange(Settings.Buoyancy);
-            OnFallDamageChange(Settings.FallDamage);
         }
 
         internal void OnCombatDown()
@@ -455,7 +457,7 @@ namespace ml_prm
 
         internal void OnChangeFlight()
         {
-            OnFallDamageChange(Settings.FallDamage);
+            ResetStates();
 
             if(m_avatarReady && m_enabled && MovementSystem.Instance.flying)
             {
@@ -467,7 +469,7 @@ namespace ml_prm
 
         internal void OnPlayerTeleport()
         {
-            OnFallDamageChange(Settings.FallDamage);
+            ResetStates();
 
             if(m_avatarReady && m_enabled)
                 m_ragdollLastPos = m_puppetReferences.hips.position;
@@ -669,6 +671,14 @@ namespace ml_prm
 
         public bool IsRagdolled() => (m_avatarReady && m_enabled);
 
+        void ResetStates()
+        {
+            m_lastPosition = this.transform.position;
+            m_velocity = Vector3.zero;
+            m_inAir = false;
+            m_inAirDistance = 0f;
+        }
+
         static Transform CloneTransform(Transform p_source, Transform p_parent, string p_name)
         {
             Transform l_target = new GameObject(p_name).transform;