Merge pull request #204 from De-Panther/null_reference_interactables

Fixed null reference errors when destroying contacted interactables

Author: De-Panther

Packages/webxr-interactions/CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Null reference errors when destroying contacted interactables.
+
 ## [0.14.0] - 2021-12-26
 ### Added
 - Support for AR headsets in SceneHitTest.

Packages/webxr-interactions/Runtime/Scripts/ControllerInteraction.cs

@@ -528,9 +528,15 @@ private Rigidbody GetNearestRigidBody()
       Rigidbody nearestRigidBody = null;
       float minDistance = float.MaxValue;
       float distance = 0.0f;
+      bool removeNulls = false;
 
       foreach (Rigidbody contactBody in contactRigidBodies)
       {
+        if (contactBody == null)
+        {
+          removeNulls = true;
+          continue;
+        }
         distance = (contactBody.gameObject.transform.position - transform.position).sqrMagnitude;
 
         if (distance < minDistance)
@@ -540,6 +546,11 @@ private Rigidbody GetNearestRigidBody()
         }
       }
 
+      if (removeNulls)
+      {
+        contactRigidBodies.RemoveAll(x => x == null);
+      }
+
       return nearestRigidBody;
     }
   }