From 7979fb38cfa526bcd300f7b37726f5ffdc76a6fd Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 13 Nov 2015 09:25:17 -0800
Subject: [PATCH] don't always send actiondata along with other physics related
 properties

---
 libraries/entities/src/EntityTree.cpp       | 1 -
 libraries/physics/src/EntityMotionState.cpp | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 7cbdc8b666..0e2b713b65 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -198,7 +198,6 @@ bool EntityTree::updateEntityWithElement(EntityItemPointer entity, const EntityI
                 properties.setVelocityChanged(false);
                 properties.setAngularVelocityChanged(false);
                 properties.setAccelerationChanged(false);
-                properties.setActionDataChanged(false);
 
                 if (wantTerseEditLogging()) {
                     qCDebug(entities) << senderNode->getUUID() << "physical edits suppressed";
diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp
index 24957bbf30..759b87f6c6 100644
--- a/libraries/physics/src/EntityMotionState.cpp
+++ b/libraries/physics/src/EntityMotionState.cpp
@@ -294,7 +294,6 @@ bool EntityMotionState::remoteSimulationOutOfSync(uint32_t simulationStep) {
 
     if (_entity->actionDataNeedsTransmit()) {
         setOutgoingPriority(SCRIPT_EDIT_SIMULATION_PRIORITY);
-        _entity->setActionDataNeedsTransmit(false);
         return true;
     }
 
@@ -457,7 +456,10 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, const Q
     properties.setVelocity(_serverVelocity);
     properties.setAcceleration(_serverAcceleration);
     properties.setAngularVelocity(_serverAngularVelocity);
-    properties.setActionData(_serverActionData);
+    if (_entity->actionDataNeedsTransmit()) {
+        _entity->setActionDataNeedsTransmit(false);
+        properties.setActionData(_serverActionData);
+    }
 
     // set the LastEdited of the properties but NOT the entity itself
     quint64 now = usecTimestampNow();