From 4d791211eef403095e8b6ea459d9a6d6c5cf5999 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 23 May 2017 10:11:16 -0700
Subject: [PATCH] Make the changes - big thanks to Andrew!

---
 libraries/entities-renderer/src/EntityTreeRenderer.cpp |  9 ++++++---
 libraries/entities/src/EntityItemProperties.cpp        |  7 ++++++-
 libraries/entities/src/EntityItemProperties.h          |  1 +
 libraries/entities/src/EntityScriptingInterface.cpp    | 10 ++++++----
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
index 09308baabb..d62181c651 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@@ -1091,15 +1091,18 @@ void EntityTreeRenderer::entityCollisionWithEntity(const EntityItemID& idA, cons
 
     // trigger scripted collision sounds and events for locally owned objects
     EntityItemPointer entityA = entityTree->findEntityByEntityItemID(idA);
-    if ((bool)entityA && myNodeID == entityA->getSimulatorID()) {
+    EntityItemPointer entityB = entityTree->findEntityByEntityItemID(idB);
+    QUuid entityASimulatorID = entityA->getSimulatorID();
+    QUuid entityBSimulatorID = entityB->getSimulatorID();
+    if ((bool)entityA && (myNodeID == entityASimulatorID || ((bool)entityB && myNodeID == entityBSimulatorID && entityASimulatorID.isNull()))) {
         playEntityCollisionSound(entityA, collision);
         emit collisionWithEntity(idA, idB, collision);
         if (_entitiesScriptEngine) {
             _entitiesScriptEngine->callEntityScriptMethod(idA, "collisionWithEntity", idB, collision);
         }
     }
-    EntityItemPointer entityB = entityTree->findEntityByEntityItemID(idB);
-    if ((bool)entityB && myNodeID == entityB->getSimulatorID()) {
+
+    if ((bool)entityB && (myNodeID == entityBSimulatorID || ((bool)entityA && myNodeID == entityASimulatorID && entityBSimulatorID.isNull()))) {
         playEntityCollisionSound(entityB, collision);
         // since we're swapping A and B we need to send the inverted collision
         Collision invertedCollision(collision);
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 1ed020e592..4595ebf70d 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -1824,10 +1824,15 @@ bool EntityItemProperties::hasTerseUpdateChanges() const {
     return _positionChanged || _velocityChanged || _rotationChanged || _angularVelocityChanged || _accelerationChanged;
 }
 
+bool EntityItemProperties::hasDynamicPhysicsChanges() const {
+    return _dynamicChanged || _velocityChanged || _angularVelocityChanged || _accelerationChanged;
+}
+
 bool EntityItemProperties::hasMiscPhysicsChanges() const {
     return _gravityChanged || _dimensionsChanged || _densityChanged || _frictionChanged
         || _restitutionChanged || _dampingChanged || _angularDampingChanged || _registrationPointChanged ||
-        _compoundShapeURLChanged || _dynamicChanged || _collisionlessChanged || _collisionMaskChanged;
+        _compoundShapeURLChanged || _collisionlessChanged || _collisionMaskChanged ||
+        _rotationChanged || _positionChanged;
 }
 
 void EntityItemProperties::clearSimulationOwner() {
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index 590298e102..697c634c67 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -274,6 +274,7 @@ public:
     void setCreated(QDateTime& v);
 
     bool hasTerseUpdateChanges() const;
+    bool hasDynamicPhysicsChanges() const;
     bool hasMiscPhysicsChanges() const;
 
     void clearSimulationOwner();
diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index b184d648da..367343cb60 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -414,15 +414,17 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties&
             entityFound = true;
             // make sure the properties has a type, so that the encode can know which properties to include
             properties.setType(entity->getType());
-            bool hasTerseUpdateChanges = properties.hasTerseUpdateChanges();
-            bool hasPhysicsChanges = properties.hasMiscPhysicsChanges() || hasTerseUpdateChanges;
-            if (_bidOnSimulationOwnership && hasPhysicsChanges) {
+            bool hasMiscPhysicsChanges = properties.hasMiscPhysicsChanges();
+            bool hasDynamicsChanges = properties.hasDynamicPhysicsChanges();
+            // _bidOnSimulationOwnership is set per-instance of the scripting interface.
+            // It essentially corresponds to "Am I an AC or an Interface client?" - ACs will never bid.
+            if ((_bidOnSimulationOwnership && ((hasMiscPhysicsChanges && entity->isMoving()) || hasDynamicsChanges))) {
                 auto nodeList = DependencyManager::get<NodeList>();
                 const QUuid myNodeID = nodeList->getSessionUUID();
 
                 if (entity->getSimulatorID() == myNodeID) {
                     // we think we already own the simulation, so make sure to send ALL TerseUpdate properties
-                    if (hasTerseUpdateChanges) {
+                    if (properties.hasTerseUpdateChanges()) {
                         entity->getAllTerseUpdateProperties(properties);
                     }
                     // TODO: if we knew that ONLY TerseUpdate properties have changed in properties AND the object