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] 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;