From b86b07c08f03b8c11b0f593d97a6f68d92845269 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 24 May 2017 14:15:59 -0700
Subject: [PATCH] Pull out ownership bidding changes

---
 libraries/entities/src/EntityItemProperties.cpp     |  7 +------
 libraries/entities/src/EntityItemProperties.h       |  1 -
 libraries/entities/src/EntityScriptingInterface.cpp | 10 ++++------
 libraries/networking/src/udt/PacketHeaders.h        |  4 ++--
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index fa4df72387..1ed020e592 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -1824,15 +1824,10 @@ bool EntityItemProperties::hasTerseUpdateChanges() const {
     return _positionChanged || _velocityChanged || _rotationChanged || _angularVelocityChanged || _accelerationChanged;
 }
 
-bool EntityItemProperties::hasDynamicPhysicsChanges() const {
-    return _velocityChanged || _angularVelocityChanged || _accelerationChanged;
-}
-
 bool EntityItemProperties::hasMiscPhysicsChanges() const {
     return _gravityChanged || _dimensionsChanged || _densityChanged || _frictionChanged
         || _restitutionChanged || _dampingChanged || _angularDampingChanged || _registrationPointChanged ||
-        _compoundShapeURLChanged || _dynamicChanged || _collisionlessChanged || _collisionMaskChanged ||
-        _rotationChanged || _positionChanged;
+        _compoundShapeURLChanged || _dynamicChanged || _collisionlessChanged || _collisionMaskChanged;
 }
 
 void EntityItemProperties::clearSimulationOwner() {
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index 697c634c67..590298e102 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -274,7 +274,6 @@ 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 367343cb60..b184d648da 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -414,17 +414,15 @@ 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 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))) {
+            bool hasTerseUpdateChanges = properties.hasTerseUpdateChanges();
+            bool hasPhysicsChanges = properties.hasMiscPhysicsChanges() || hasTerseUpdateChanges;
+            if (_bidOnSimulationOwnership && hasPhysicsChanges) {
                 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 (properties.hasTerseUpdateChanges()) {
+                    if (hasTerseUpdateChanges) {
                         entity->getAllTerseUpdateProperties(properties);
                     }
                     // TODO: if we knew that ONLY TerseUpdate properties have changed in properties AND the object
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index 0dbbcd771f..2cc3a2c42e 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -114,8 +114,8 @@ public:
         EntityServerScriptLog,
         AdjustAvatarSorting,
         OctreeFileReplacement,
-        SimulationBiddingChanges,
-        LAST_PACKET_TYPE = SimulationBiddingChanges
+        CollisionEventChanges,
+        LAST_PACKET_TYPE = CollisionEventChanges
     };
 };