From 4f24a7618a9ed9957bebfc29fe3fda31bb34ddac Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Tue, 9 May 2017 10:23:04 -0700
Subject: [PATCH] cleanups

---
 libraries/entities/src/EntityTree.cpp       | 38 +++++++--------------
 libraries/physics/src/ObjectActionMotor.cpp |  2 +-
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index d586fe9d06..2285e6e4bd 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -1531,6 +1531,10 @@ void EntityTree::pruneTree() {
 
 
 QByteArray EntityTree::remapActionDataIDs(QByteArray actionData, QHash<EntityItemID, EntityItemID>& map) {
+    if (actionData.isEmpty()) {
+        return actionData;
+    }
+
     QDataStream serializedActionsStream(actionData);
     QVector<QByteArray> serializedActions;
     serializedActionsStream >> serializedActions;
@@ -1617,11 +1621,9 @@ bool EntityTree::sendEntitiesOperation(OctreeElementPointer element, void* extra
     };
 
     entityTreeElement->forEachEntity([&args, &getMapped, &element](EntityItemPointer item) {
-
-        EntityItemID oldID = item->getEntityItemID();
-        EntityItemID newID = getMapped(oldID);
-
+        EntityItemID newID = getMapped(item->getEntityItemID());
         EntityItemProperties properties = item->getProperties();
+
         EntityItemID oldParentID = properties.getParentID();
         if (oldParentID.isInvalidID()) {  // no parent
             properties.setPosition(properties.getPosition() + args->root);
@@ -1635,29 +1637,15 @@ bool EntityTree::sendEntitiesOperation(OctreeElementPointer element, void* extra
             }
         }
 
-        if (!properties.getXNNeighborID().isInvalidID()) {
-            properties.setXNNeighborID(getMapped(properties.getXNNeighborID()));
-        }
-        if (!properties.getXPNeighborID().isInvalidID()) {
-            properties.setXPNeighborID(getMapped(properties.getXPNeighborID()));
-        }
-        if (!properties.getYNNeighborID().isInvalidID()) {
-            properties.setYNNeighborID(getMapped(properties.getYNNeighborID()));
-        }
-        if (!properties.getYPNeighborID().isInvalidID()) {
-            properties.setYPNeighborID(getMapped(properties.getYPNeighborID()));
-        }
-        if (!properties.getZNNeighborID().isInvalidID()) {
-            properties.setZNNeighborID(getMapped(properties.getZNNeighborID()));
-        }
-        if (!properties.getZPNeighborID().isInvalidID()) {
-            properties.setZPNeighborID(getMapped(properties.getZPNeighborID()));
-        }
+        properties.setXNNeighborID(getMapped(properties.getXNNeighborID()));
+        properties.setXPNeighborID(getMapped(properties.getXPNeighborID()));
+        properties.setYNNeighborID(getMapped(properties.getYNNeighborID()));
+        properties.setYPNeighborID(getMapped(properties.getYPNeighborID()));
+        properties.setZNNeighborID(getMapped(properties.getZNNeighborID()));
+        properties.setZPNeighborID(getMapped(properties.getZPNeighborID()));
 
         QByteArray actionData = properties.getActionData();
-        if (!actionData.isEmpty()) {
-            properties.setActionData(remapActionDataIDs(actionData, *args->map));
-        }
+        properties.setActionData(remapActionDataIDs(actionData, *args->map));
 
         // set creation time to "now" for imported entities
         properties.setCreated(usecTimestampNow());
diff --git a/libraries/physics/src/ObjectActionMotor.cpp b/libraries/physics/src/ObjectActionMotor.cpp
index a3c1537535..b3cc0ccc48 100644
--- a/libraries/physics/src/ObjectActionMotor.cpp
+++ b/libraries/physics/src/ObjectActionMotor.cpp
@@ -57,7 +57,7 @@ void ObjectActionMotor::updateActionWorker(btScalar deltaTimeStep) {
 
         if (_angularTimeScale < MAX_MOTOR_TIMESCALE) {
 
-            if (_otherID != QUuid()) {
+            if (!_otherID.isEmpty()) {
                 if (other) {
                     glm::vec3 otherAngularVelocity = other->getAngularVelocity();
                     rigidBody->setAngularVelocity(glmToBullet(_angularVelocityTarget + otherAngularVelocity));