don't accept incoming location edits if an entity is being controlled by a shouldSuppressLocationEdits action

This commit is contained in:
Seth Alves 2015-10-19 15:57:15 -07:00
parent 6138775270
commit a1cfebc173

View file

@ -189,7 +189,7 @@ bool EntityTree::updateEntityWithElement(EntityItemPointer entity, const EntityI
} else { } else {
simulationBlocked = senderID != entity->getSimulatorID(); simulationBlocked = senderID != entity->getSimulatorID();
} }
if (simulationBlocked) { if (simulationBlocked || entity->shouldSuppressLocationEdits()) {
// squash ownership and physics-related changes. // squash ownership and physics-related changes.
properties.setSimulationOwnerChanged(false); properties.setSimulationOwnerChanged(false);
properties.setPositionChanged(false); properties.setPositionChanged(false);