From 3d340c43124d4b4e015af60f0eda0183bc4ffc86 Mon Sep 17 00:00:00 2001
From: Pascal Serrarens <pascal@passervr.com>
Date: Fri, 14 Apr 2023 10:32:03 +0200
Subject: [PATCH] Add check for disappeared colliders

---
 Runtime/Tools/Physics/HybridPhysics.cs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Runtime/Tools/Physics/HybridPhysics.cs b/Runtime/Tools/Physics/HybridPhysics.cs
index 805b1c6..951b60c 100644
--- a/Runtime/Tools/Physics/HybridPhysics.cs
+++ b/Runtime/Tools/Physics/HybridPhysics.cs
@@ -90,7 +90,7 @@ namespace Passer {
         }
 
         virtual protected void UpdateKinematicRigidbody() {
-            if (mode == PhysicsMode.NonKinematic || 
+            if (mode == PhysicsMode.NonKinematic ||
                 thisRigidbody.mass > kinematicMass ||
                 thisRigidbody.GetComponent<Joint>() != null
                 ) {
@@ -183,7 +183,7 @@ namespace Passer {
                 // The sweeptests fail quite often...
                 //RaycastHit hit;
                 //if (!thisRigidbody.SweepTest(target.transform.position - thisRigidbody.position, out hit))
-                    hasCollided = false;
+                hasCollided = false;
 
             }
         }
@@ -581,8 +581,10 @@ namespace Passer {
             if (colliders == null)
                 return;
 
-            foreach (Collider c in colliders)
-                c.isTrigger = false;
+            foreach (Collider c in colliders) {
+                if (c != null)
+                    c.isTrigger = false;
+            }
         }
 
         /// <summary>
@@ -597,8 +599,10 @@ namespace Passer {
             if (colliders == null)
                 return;
 
-            foreach (Collider c in colliders)
-                c.isTrigger = false;
+            foreach (Collider c in colliders) {
+                if (c != null)
+                    c.isTrigger = false;
+            }
         }
 
         #endregion