From 2bf7ac27451d0fd953d829cd13871d2041ea62ab Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Tue, 15 Jan 2019 11:36:08 -0800
Subject: [PATCH] fix bug that was introducing a local velocity to an entity
 when it was parented to a moving avatar

---
 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 1fdff19e38..affd061af1 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) {
-        setPosition(entity->getWorldPosition());
+        setLocalPosition(entity->getLocalPosition());
     }
     if (!_localRotationChanged && !_rotationChanged) {
-        setRotation(entity->getWorldOrientation());
+        setLocalRotation(entity->getLocalOrientation());
     }
     if (!_localVelocityChanged && !_velocityChanged) {
-        setVelocity(entity->getWorldVelocity());
+        setLocalVelocity(entity->getLocalVelocity());
     }
     if (!_localAngularVelocityChanged && !_angularVelocityChanged) {
-        setAngularVelocity(entity->getWorldAngularVelocity());
+        setLocalAngularVelocity(entity->getLocalAngularVelocity());
     }
     if (!_accelerationChanged) {
         setAcceleration(entity->getAcceleration());
     }
     if (!_localDimensionsChanged && !_dimensionsChanged) {
-        setDimensions(entity->getScaledDimensions());
+        setLocalDimensions(entity->getUnscaledDimensions());
     }
 }