Unified · Split
| @@ -198,7 +198,6 @@ bool EntityTree::updateEntityWithElement(EntityItemPointer entity, const EntityI · 197 unmodified lines | ||
| 198 | 198 | properties.setVelocityChanged(false); |
| 199 | 199 | properties.setAngularVelocityChanged(false); |
| 200 | 200 | properties.setAccelerationChanged(false); |
| 201 | − properties.setActionDataChanged(false); | |
| 202 | 201 | |
| 203 | 202 | if (wantTerseEditLogging()) { |
| 204 | 203 | qCDebug(entities) << senderNode->getUUID() << "physical edits suppressed"; |
| @@ -294,7 +294,6 @@ bool EntityMotionState::remoteSimulationOutOfSync(uint32_t simulationStep) { · 293 unmodified lines | ||
| 294 | 294 | |
| 295 | 295 | if (_entity->actionDataNeedsTransmit()) { |
| 296 | 296 | setOutgoingPriority(SCRIPT_EDIT_SIMULATION_PRIORITY); |
| 297 | − _entity->setActionDataNeedsTransmit(false); | |
| 298 | 297 | return true; |
| 299 | 298 | } |
| 300 | 299 | |
| @@ -457,7 +456,10 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, const Q · 156 unmodified lines | ||
| 457 | 456 | properties.setVelocity(_serverVelocity); |
| 458 | 457 | properties.setAcceleration(_serverAcceleration); |
| 459 | 458 | properties.setAngularVelocity(_serverAngularVelocity); |
| 460 | − properties.setActionData(_serverActionData); | |
| 459 | + if (_entity->actionDataNeedsTransmit()) { | |
| 460 | + _entity->setActionDataNeedsTransmit(false); | |
| 461 | + properties.setActionData(_serverActionData); | |
| 462 | + } | |
| 461 | 463 | |
| 462 | 464 | // set the LastEdited of the properties but NOT the entity itself |
| 463 | 465 | quint64 now = usecTimestampNow(); |