From db374b8c6d0814dc3750d255efb93d906275c7dd Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Thu, 30 Nov 2017 14:49:06 -0800 Subject: [PATCH] fixing adjusting equipped entities --- .../controllers/controllerModules/nearParentGrabEntity.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/system/controllers/controllerModules/nearParentGrabEntity.js b/scripts/system/controllers/controllerModules/nearParentGrabEntity.js index 26bebc9247..01c8424e0c 100644 --- a/scripts/system/controllers/controllerModules/nearParentGrabEntity.js +++ b/scripts/system/controllers/controllerModules/nearParentGrabEntity.js @@ -81,7 +81,8 @@ Script.include("/~/system/libraries/cloneEntityUtils.js"); }; this.otherHandIsParent = function(props) { - return this.getOtherModule().thisHandIsParent(props); + var otherModule = this.getOtherModule(); + return (otherModule.thisHandIsParent(props) && otherModule.grabbing); }; this.startNearParentingGrabEntity = function (controllerData, targetProps) {