From 92a058a0acba32356438b6f204c4157671f1e42d Mon Sep 17 00:00:00 2001 From: SDraw Date: Tue, 11 Apr 2023 10:17:32 +0300 Subject: [PATCH] Removed `PlayerLocal` layer usage to avoid possible world maps problems --- ml_prm/RagdollController.cs | 1 - ml_prm/RagdollTrigger.cs | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ml_prm/RagdollController.cs b/ml_prm/RagdollController.cs index de063e5..4b91dca 100644 --- a/ml_prm/RagdollController.cs +++ b/ml_prm/RagdollController.cs @@ -204,7 +204,6 @@ namespace ml_prm Collider l_collider = l_puppetTransforms[i].GetComponent(); if(l_collider != null) { - l_collider.gameObject.layer = LayerMask.NameToLayer("PlayerLocal"); Physics.IgnoreCollision(l_collider, MovementSystem.Instance.proxyCollider, true); Physics.IgnoreCollision(l_collider, MovementSystem.Instance.controller, true); Physics.IgnoreCollision(l_collider, MovementSystem.Instance.forceCollider, true); diff --git a/ml_prm/RagdollTrigger.cs b/ml_prm/RagdollTrigger.cs index 83f987f..fb0ee93 100644 --- a/ml_prm/RagdollTrigger.cs +++ b/ml_prm/RagdollTrigger.cs @@ -6,15 +6,13 @@ namespace ml_prm [DisallowMultipleComponent] class RagdollTrigger : MonoBehaviour { - static readonly int ms_localPlayerLayer = LayerMask.NameToLayer("PlayerLocal"); - Collider m_lastCollider = null; bool m_triggered = false; void OnTriggerEnter(Collider p_other) { CVRPointer l_pointer = p_other.gameObject.GetComponent(); - 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") && (m_lastCollider != p_other)) { m_lastCollider = p_other; m_triggered = true;