From ce787d5803f44cf1e207119b3a42acffed1a963a Mon Sep 17 00:00:00 2001
From: armored-dragon <publicmail@armoreddragon.com>
Date: Mon, 24 Mar 2025 16:24:36 -0500
Subject: [PATCH 1/2] Add check to see if hudRayPick intersects.

---
 scripts/system/controllers/controllerModules/farGrabEntity.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/system/controllers/controllerModules/farGrabEntity.js b/scripts/system/controllers/controllerModules/farGrabEntity.js
index 43109198fe..1fca0e4638 100644
--- a/scripts/system/controllers/controllerModules/farGrabEntity.js
+++ b/scripts/system/controllers/controllerModules/farGrabEntity.js
@@ -357,11 +357,14 @@ Script.include("/~/system/libraries/controllers.js");
         };
 
         this.notPointingAtEntity = function (controllerData) {
+            if (!hudRayPick.intersects) return;
+            
             var intersection = controllerData.rayPicks[this.hand];
             var entityProperty = Entities.getEntityProperties(intersection.objectID, "type");
             var entityType = entityProperty.type;
             var hudRayPick = controllerData.hudRayPicks[this.hand];
             var point2d = this.calculateNewReticlePosition(hudRayPick.intersection);
+
             if ((intersection.type === Picks.INTERSECTED_ENTITY && entityType === "Web") ||
                 intersection.type === Picks.INTERSECTED_OVERLAY || Window.isPointOnDesktopWindow(point2d)) {
                 return true;

From d8103eb7dd3d2f0f476e1ebb1f01b9cb82e88344 Mon Sep 17 00:00:00 2001
From: armored-dragon <publicmail@armoreddragon.com>
Date: Mon, 31 Mar 2025 13:06:27 -0500
Subject: [PATCH 2/2] Explicitly return false.

---
 scripts/system/controllers/controllerModules/farGrabEntity.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/system/controllers/controllerModules/farGrabEntity.js b/scripts/system/controllers/controllerModules/farGrabEntity.js
index 1fca0e4638..4b3abc2b85 100644
--- a/scripts/system/controllers/controllerModules/farGrabEntity.js
+++ b/scripts/system/controllers/controllerModules/farGrabEntity.js
@@ -357,7 +357,7 @@ Script.include("/~/system/libraries/controllers.js");
         };
 
         this.notPointingAtEntity = function (controllerData) {
-            if (!hudRayPick.intersects) return;
+            if (!hudRayPick.intersects) return false;
             
             var intersection = controllerData.rayPicks[this.hand];
             var entityProperty = Entities.getEntityProperties(intersection.objectID, "type");