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

---
 libraries/entities/src/EntityItem.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 3eb8a84bca..00ba6e8d42 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -1810,25 +1810,25 @@ bool EntityItem::shouldSuppressLocationEdits() const {
 }
 
 void EntityItem::setPosition(const glm::vec3& value) {
-    if (!entity->shouldSuppressLocationEdits()) {
+    if (!shouldSuppressLocationEdits()) {
         _transform.setTranslation(value); requiresRecalcBoxes();
     }
 }
 
 void EntityItem::setRotation(const glm::quat& rotation) {
-    if (!entity->shouldSuppressLocationEdits()) {
+    if (!shouldSuppressLocationEdits()) {
         _transform.setRotation(rotation); requiresRecalcBoxes();
     }
 }
 
 void EntityItem::setVelocity(const glm::vec3& value) {
-    if (!entity->shouldSuppressLocationEdits()) {
+    if (!shouldSuppressLocationEdits()) {
         _velocity = value;
     }
 }
 
 void EntityItem::setAcceleration(const glm::vec3& value) {
-    if (!entity->shouldSuppressLocationEdits()) {
+    if (!shouldSuppressLocationEdits()) {
         _acceleration = value;
     }
 }