From 05a80ae0e4f9536387347526141685ffb660dbd6 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 14 Dec 2018 17:07:07 -0800
Subject: [PATCH] don't bootstrap with a traits-based grab

---
 libraries/entities/src/EntityItem.cpp | 55 +++++++++++++++++----------
 libraries/entities/src/EntityItem.h   |  3 ++
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 2c05c8910b..cddf961dbd 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -2096,6 +2096,35 @@ bool EntityItem::addAction(EntitySimulationPointer simulation, EntityDynamicPoin
     return result;
 }
 
+void EntityItem::enableNoBootstrap() {
+    if (!(bool)(_flags & Simulation::SPECIAL_FLAGS_NO_BOOTSTRAPPING)) {
+        _flags |= Simulation::SPECIAL_FLAGS_NO_BOOTSTRAPPING;
+        _flags |= Simulation::DIRTY_COLLISION_GROUP; // may need to not collide with own avatar
+        forEachDescendant([&](SpatiallyNestablePointer child) {
+            if (child->getNestableType() == NestableType::Entity) {
+                EntityItemPointer entity = std::static_pointer_cast<EntityItem>(child);
+                entity->markDirtyFlags(Simulation::DIRTY_COLLISION_GROUP);
+                entity->markSpecialFlags(Simulation::SPECIAL_FLAGS_NO_BOOTSTRAPPING);
+            }
+        });
+    }
+}
+
+void EntityItem::disableNoBootstrap() {
+    if (!stillHasGrabActions()) {
+        _flags &= ~Simulation::SPECIAL_FLAGS_NO_BOOTSTRAPPING;
+        _flags |= Simulation::DIRTY_COLLISION_GROUP; // may need to not collide with own avatar
+        forEachDescendant([&](SpatiallyNestablePointer child) {
+            if (child->getNestableType() == NestableType::Entity) {
+                EntityItemPointer entity = std::static_pointer_cast<EntityItem>(child);
+                entity->markDirtyFlags(Simulation::DIRTY_COLLISION_GROUP);
+                entity->clearSpecialFlags(Simulation::SPECIAL_FLAGS_NO_BOOTSTRAPPING);
+            }
+        });
+    }
+}
+
+
 bool EntityItem::addActionInternal(EntitySimulationPointer simulation, EntityDynamicPointer action) {
     assert(action);
     assert(simulation);
@@ -2117,17 +2146,7 @@ bool EntityItem::addActionInternal(EntitySimulationPointer simulation, EntityDyn
 
         auto actionType = action->getType();
         if (actionType == DYNAMIC_TYPE_HOLD || actionType == DYNAMIC_TYPE_FAR_GRAB) {
-            if (!(bool)(_flags & Simulation::SPECIAL_FLAGS_NO_BOOTSTRAPPING)) {
-                _flags |= Simulation::SPECIAL_FLAGS_NO_BOOTSTRAPPING;
-                _flags |= Simulation::DIRTY_COLLISION_GROUP; // may need to not collide with own avatar
-                forEachDescendant([&](SpatiallyNestablePointer child) {
-                    if (child->getNestableType() == NestableType::Entity) {
-                        EntityItemPointer entity = std::static_pointer_cast<EntityItem>(child);
-                        entity->markDirtyFlags(Simulation::DIRTY_COLLISION_GROUP);
-                        entity->markSpecialFlags(Simulation::SPECIAL_FLAGS_NO_BOOTSTRAPPING);
-                    }
-                });
-            }
+            enableNoBootstrap();
         }
     } else {
         qCDebug(entities) << "EntityItem::addActionInternal -- serializeActions failed";
@@ -2208,16 +2227,8 @@ bool EntityItem::removeActionInternal(const QUuid& actionID, EntitySimulationPoi
         action->setIsMine(false);
         _objectActions.remove(actionID);
 
-        if ((removedActionType == DYNAMIC_TYPE_HOLD || removedActionType == DYNAMIC_TYPE_FAR_GRAB) && !stillHasGrabActions()) {
-            _flags &= ~Simulation::SPECIAL_FLAGS_NO_BOOTSTRAPPING;
-            _flags |= Simulation::DIRTY_COLLISION_GROUP; // may need to not collide with own avatar
-            forEachDescendant([&](SpatiallyNestablePointer child) {
-                if (child->getNestableType() == NestableType::Entity) {
-                    EntityItemPointer entity = std::static_pointer_cast<EntityItem>(child);
-                    entity->markDirtyFlags(Simulation::DIRTY_COLLISION_GROUP);
-                    entity->clearSpecialFlags(Simulation::SPECIAL_FLAGS_NO_BOOTSTRAPPING);
-                }
-            });
+        if (removedActionType == DYNAMIC_TYPE_HOLD || removedActionType == DYNAMIC_TYPE_FAR_GRAB) {
+            disableNoBootstrap();
         } else {
             // NO-OP: we assume SPECIAL_FLAGS_NO_BOOTSTRAPPING bits and collision group are correct
             // because they should have been set correctly when the action was added
@@ -3299,6 +3310,7 @@ bool EntityItem::isWearable() const {
 }
 
 void EntityItem::addGrab(GrabPointer grab) {
+    enableNoBootstrap();
     SpatiallyNestable::addGrab(grab);
 
     if (getDynamic() && getParentID().isNull()) {
@@ -3357,4 +3369,5 @@ void EntityItem::removeGrab(GrabPointer grab) {
             }
         }
     }
+    disableNoBootstrap();
 }
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index 998409f6fa..09cd0b5d26 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -670,6 +670,9 @@ protected:
     bool _simulated { false }; // set by EntitySimulation
     bool _visuallyReady { true };
 
+    void enableNoBootstrap();
+    void disableNoBootstrap();
+
     bool addActionInternal(EntitySimulationPointer simulation, EntityDynamicPointer action);
     bool removeActionInternal(const QUuid& actionID, EntitySimulationPointer simulation = nullptr);
     void deserializeActionsInternal();