From e22024b0dd3086386a5fcf82ddb3490f7ad64c36 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Thu, 17 Jan 2019 13:31:11 -0800
Subject: [PATCH] revert attempted fix for non-zero velocity for hats

---
 libraries/entities/src/EntityItemProperties.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index affd061af1..1fdff19e38 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -3833,22 +3833,22 @@ void EntityItemProperties::copySimulationRestrictedProperties(const EntityItemPo
         setParentJointIndex(entity->getParentJointIndex());
     }
     if (!_localPositionChanged && !_positionChanged) {
-        setLocalPosition(entity->getLocalPosition());
+        setPosition(entity->getWorldPosition());
     }
     if (!_localRotationChanged && !_rotationChanged) {
-        setLocalRotation(entity->getLocalOrientation());
+        setRotation(entity->getWorldOrientation());
     }
     if (!_localVelocityChanged && !_velocityChanged) {
-        setLocalVelocity(entity->getLocalVelocity());
+        setVelocity(entity->getWorldVelocity());
     }
     if (!_localAngularVelocityChanged && !_angularVelocityChanged) {
-        setLocalAngularVelocity(entity->getLocalAngularVelocity());
+        setAngularVelocity(entity->getWorldAngularVelocity());
     }
     if (!_accelerationChanged) {
         setAcceleration(entity->getAcceleration());
     }
     if (!_localDimensionsChanged && !_dimensionsChanged) {
-        setLocalDimensions(entity->getUnscaledDimensions());
+        setDimensions(entity->getScaledDimensions());
     }
 }