From 23f1767634cf0c7a7fc5444ab3933c5ede22d58b Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Mon, 20 Apr 2015 16:13:28 -0700
Subject: [PATCH] cleanup

---
 libraries/physics/src/PhysicsEngine.cpp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp
index a55da0fa8c..fbfb7914f0 100644
--- a/libraries/physics/src/PhysicsEngine.cpp
+++ b/libraries/physics/src/PhysicsEngine.cpp
@@ -371,8 +371,6 @@ void PhysicsEngine::computeCollisionEvents() {
 
     const btCollisionObject* characterCollisionObject =
         _characterController ? _characterController->getCollisionObject() : NULL;
-    auto nodeList = DependencyManager::get<NodeList>();
-    const QUuid& myNodeID = nodeList->getSessionUUID();
 
     // update all contacts every frame
     int numManifolds = _collisionDispatcher->getNumManifolds();
@@ -400,15 +398,11 @@ void PhysicsEngine::computeCollisionEvents() {
                 // see EntityMotionState::sendUpdate
                 if (objectA == characterCollisionObject && !objectB->isStaticOrKinematicObject() && b) {
                     EntityItem* entityB = static_cast<EntityMotionState*>(b)->getEntity();
-                    if (entityB->getSimulatorID() != myNodeID && !entityB->getShouldClaimSimulationOwnership()) {
-                        entityB->setShouldClaimSimulationOwnership(true);
-                    }
+                    entityB->setShouldClaimSimulationOwnership(true);
                 }
                 if (objectB == characterCollisionObject && !objectA->isStaticOrKinematicObject() && a) {
                     EntityItem* entityA = static_cast<EntityMotionState*>(a)->getEntity();
-                    if (entityA->getSimulatorID() != myNodeID && !entityA->getShouldClaimSimulationOwnership()) {
-                        entityA->setShouldClaimSimulationOwnership(true);
-                    }
+                    entityA->setShouldClaimSimulationOwnership(true);
                 }
             }
         }