From a1cfebc173695dbff90c97c5f356ac5a6922727b Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Mon, 19 Oct 2015 15:57:15 -0700
Subject: [PATCH] don't accept incoming location edits if an entity is being
 controlled by a shouldSuppressLocationEdits action

---
 libraries/entities/src/EntityTree.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 6e487cbfe3..8449ce050b 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -189,7 +189,7 @@ bool EntityTree::updateEntityWithElement(EntityItemPointer entity, const EntityI
             } else {
                 simulationBlocked = senderID != entity->getSimulatorID();
             }
-            if (simulationBlocked) {
+            if (simulationBlocked || entity->shouldSuppressLocationEdits()) {
                 // squash ownership and physics-related changes.
                 properties.setSimulationOwnerChanged(false);
                 properties.setPositionChanged(false);