From 3c22c9ea3a0619d18e947b9697788f41f4010664 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 21 Sep 2017 11:39:14 -0700
Subject: [PATCH] back out bad change

---
 scripts/system/controllers/controllerDispatcher.js              | 2 ++
 .../controllers/controllerModules/nearParentGrabEntity.js       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/system/controllers/controllerDispatcher.js b/scripts/system/controllers/controllerDispatcher.js
index da0a42413e..4bed004e67 100644
--- a/scripts/system/controllers/controllerDispatcher.js
+++ b/scripts/system/controllers/controllerDispatcher.js
@@ -299,6 +299,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
                         // activity-slots which this plugin consumes as "in use"
                         _this.runningPluginNames[orderedPluginName] = true;
                         _this.markSlots(candidatePlugin, orderedPluginName);
+                        print("QQQQ running " + orderedPluginName);
                     }
                     if (PROFILE) {
                         Script.endProfileRange("dispatch.isReady." + orderedPluginName);
@@ -331,6 +332,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
                             // of running plugins and mark its activity-slots as "not in use"
                             delete _this.runningPluginNames[runningPluginName];
                             _this.markSlots(plugin, false);
+                            print("QQQQ stopping " + runningPluginName);
                         }
                         if (PROFILE) {
                             Script.endProfileRange("dispatch.run." + runningPluginName);
diff --git a/scripts/system/controllers/controllerModules/nearParentGrabEntity.js b/scripts/system/controllers/controllerModules/nearParentGrabEntity.js
index d3548a9356..e0bb596253 100644
--- a/scripts/system/controllers/controllerModules/nearParentGrabEntity.js
+++ b/scripts/system/controllers/controllerModules/nearParentGrabEntity.js
@@ -300,7 +300,7 @@ Script.include("/~/system/libraries/cloneEntityUtils.js");
                     if (targetCloneable) {
                         var worldEntityProps = controllerData.nearbyEntityProperties[this.hand];
                         var cloneID = cloneEntity(targetProps, worldEntityProps);
-                        var cloneProps = controllerData.nearbyEntityPropertiesByID[cloneID];
+                        var cloneProps = Entities.getEntityProperties(cloneID);
                         this.grabbing = true;
                         this.targetEntityID = cloneID;
                         this.startNearParentingGrabEntity(controllerData, cloneProps);