From 644532dd5949439f46346383784b3ea7b21808ad Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Tue, 26 Sep 2017 15:17:23 -0700
Subject: [PATCH 1/2] only send startNearTrigger once

---
 .../controllers/controllerModules/nearTrigger.js     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/scripts/system/controllers/controllerModules/nearTrigger.js b/scripts/system/controllers/controllerModules/nearTrigger.js
index edea1f993d..cb913bc735 100644
--- a/scripts/system/controllers/controllerModules/nearTrigger.js
+++ b/scripts/system/controllers/controllerModules/nearTrigger.js
@@ -26,6 +26,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
         this.previousParentID = {};
         this.previousParentJointIndex = {};
         this.previouslyUnhooked = {};
+        this.startSent = false;
 
         this.parameters = makeDispatcherModuleParameters(
             520,
@@ -76,7 +77,6 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
             var targetProps = this.getTargetProps(controllerData);
             if (targetProps) {
                 this.targetEntityID = targetProps.id;
-                this.startNearTrigger(controllerData);
                 return makeRunningValues(true, [this.targetEntityID], []);
             } else {
                 return makeRunningValues(false, [], []);
@@ -84,12 +84,16 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
         };
 
         this.run = function (controllerData) {
-            if (controllerData.triggerClicks[this.hand] === 0) {
+            if (!this.startSent) {
+                this.startNearTrigger(controllerData);
+                this.startSent = true;
+            } else if (controllerData.triggerClicks[this.hand] === 0) {
                 this.endNearTrigger(controllerData);
+                this.startSent = false;
                 return makeRunningValues(false, [], []);
+            } else {
+                this.continueNearTrigger(controllerData);
             }
-
-            this.continueNearTrigger(controllerData);
             return makeRunningValues(true, [this.targetEntityID], []);
         };
 

From 8180acbffcac123e05e21a5ab5c90618f53addf5 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Tue, 26 Sep 2017 16:29:22 -0700
Subject: [PATCH 2/2] use same trigger test as in isReady

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

diff --git a/scripts/system/controllers/controllerModules/nearTrigger.js b/scripts/system/controllers/controllerModules/nearTrigger.js
index cb913bc735..09ba5b9430 100644
--- a/scripts/system/controllers/controllerModules/nearTrigger.js
+++ b/scripts/system/controllers/controllerModules/nearTrigger.js
@@ -87,7 +87,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
             if (!this.startSent) {
                 this.startNearTrigger(controllerData);
                 this.startSent = true;
-            } else if (controllerData.triggerClicks[this.hand] === 0) {
+            } else if (controllerData.triggerValues[this.hand] < TRIGGER_OFF_VALUE) {
                 this.endNearTrigger(controllerData);
                 this.startSent = false;
                 return makeRunningValues(false, [], []);