From 9a262b2ded5c52083a3cc964091543510cd2442b Mon Sep 17 00:00:00 2001
From: SDraw <sdraw@protonmail.com>
Date: Tue, 11 Apr 2023 09:46:27 +0300
Subject: [PATCH] Minor fixes

---
 ml_prm/RagdollController.cs | 10 ++++++----
 ml_prm/RagdollTrigger.cs    |  9 ++-------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/ml_prm/RagdollController.cs b/ml_prm/RagdollController.cs
index db0e46c..de063e5 100644
--- a/ml_prm/RagdollController.cs
+++ b/ml_prm/RagdollController.cs
@@ -93,7 +93,7 @@ namespace ml_prm
             if(m_enabled && m_avatarReady && BodySystem.isCalibratedAsFullBody)
                 BodySystem.TrackingPositionWeight = 0f;
 
-            if(!m_enabled && m_avatarReady && (m_customTrigger != null) && m_customTrigger.GetStateWithReset() && Settings.PointersReaction)
+            if((m_customTrigger != null) && m_customTrigger.GetStateWithReset() && !m_enabled && m_avatarReady && Settings.PointersReaction)
                 SwitchRagdoll();
         }
 
@@ -277,7 +277,8 @@ namespace ml_prm
                 foreach(Rigidbody l_body in m_rigidBodies)
                 {
                     l_body.drag = p_value;
-                    l_body.WakeUp();
+                    if(m_enabled)
+                        l_body.WakeUp();
                 }
             }
         }
@@ -288,7 +289,8 @@ namespace ml_prm
                 foreach(Rigidbody l_body in m_rigidBodies)
                 {
                     l_body.angularDrag = p_value;
-                    l_body.WakeUp();
+                    if(m_enabled)
+                        l_body.WakeUp();
                 }
             }
         }
@@ -309,10 +311,10 @@ namespace ml_prm
                 m_enabled = !m_enabled;
 
                 MovementSystem.Instance.SetImmobilized(m_enabled);
-                PlayerSetup.Instance.animatorManager.SetAnimatorParameterTrigger("CancelEmote");
 
                 if(m_enabled)
                 {
+                    PlayerSetup.Instance.animatorManager.SetAnimatorParameterTrigger("CancelEmote");
                     if(BodySystem.isCalibratedAsFullBody)
                         BodySystem.TrackingPositionWeight = 0f;
 
diff --git a/ml_prm/RagdollTrigger.cs b/ml_prm/RagdollTrigger.cs
index 4b05c67..83f987f 100644
--- a/ml_prm/RagdollTrigger.cs
+++ b/ml_prm/RagdollTrigger.cs
@@ -6,20 +6,15 @@ namespace ml_prm
     [DisallowMultipleComponent]
     class RagdollTrigger : MonoBehaviour
     {
-        static int ms_localPlayerLayer = 0;
+        static readonly int ms_localPlayerLayer = LayerMask.NameToLayer("PlayerLocal");
 
         Collider m_lastCollider = null;
         bool m_triggered = false;
 
-        void Start()
-        {
-            ms_localPlayerLayer = LayerMask.NameToLayer("PlayerLocal");
-        }
-
         void OnTriggerEnter(Collider p_other)
         {
             CVRPointer l_pointer = p_other.gameObject.GetComponent<CVRPointer>();
-            if((l_pointer != null) && l_pointer.type == "ragdoll" && p_other.gameObject.layer == ms_localPlayerLayer && (m_lastCollider != p_other))
+            if((l_pointer != null) && (l_pointer.type == "ragdoll") && (p_other.gameObject.layer == ms_localPlayerLayer) && (m_lastCollider != p_other))
             {
                 m_lastCollider = p_other;
                 m_triggered = true;