From 013e15c9a2cac45f6256d4a1c101bee396bf696b Mon Sep 17 00:00:00 2001 From: druiz17 Date: Tue, 10 Oct 2017 10:54:56 -0700 Subject: [PATCH] made requested changes --- .../system/controllers/controllerModules/farActionGrabEntity.js | 2 +- scripts/system/controllers/grab.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/system/controllers/controllerModules/farActionGrabEntity.js b/scripts/system/controllers/controllerModules/farActionGrabEntity.js index 1ebed27b0e..fb380f992b 100644 --- a/scripts/system/controllers/controllerModules/farActionGrabEntity.js +++ b/scripts/system/controllers/controllerModules/farActionGrabEntity.js @@ -346,7 +346,7 @@ Script.include("/~/system/libraries/controllers.js"); Entities.callEntityMethod(this.grabbedThingID, "releaseGrab", args); if (this.madeDynamic) { - var props = Entities.getEntityProperties(this.grabbedThingID, ["dynamic", "localVelocity"]); + var props = {}; props.dynamic = false; props.localVelocity = {x: 0, y: 0, z: 0}; Entities.editEntity(this.grabbedThingID, props); diff --git a/scripts/system/controllers/grab.js b/scripts/system/controllers/grab.js index 40b1bfd23b..2f046cbce3 100644 --- a/scripts/system/controllers/grab.js +++ b/scripts/system/controllers/grab.js @@ -427,7 +427,7 @@ Grabber.prototype.releaseEvent = function(event) { } if (this.madeDynamic) { - var entityProps = Entities.getEntityProperties(this.entityID, ["dynamic", "localVelocity"]); + var entityProps = {}; entityProps.dynamic = false; entityProps.localVelocity = {x: 0, y: 0, z: 0}; Entities.editEntity(this.entityID, entityProps);