diff --git a/libraries/entities/src/EntitySimulation.cpp b/libraries/entities/src/EntitySimulation.cpp index ff20e38425..a2d20fe5d5 100644 --- a/libraries/entities/src/EntitySimulation.cpp +++ b/libraries/entities/src/EntitySimulation.cpp @@ -263,22 +263,6 @@ void EntitySimulation::moveSimpleKinematics(const quint64& now) { void EntitySimulation::addAction(EntityActionPointer action) { lock(); - - #if DEBUG - foreach (EntityActionPointer actionToAdd, _actionsToAdd) { - if (actionToAdd->getID() == action->getID()) { - qDebug() << "action added to add-list more than once"; - assert(false); - } - } - foreach (QUuid actionToRemoveID, _actionsToRemove) { - if (actionToRemoveID == action->getID()) { - qDebug() << "action added to add-list and remove-list"; - assert(false); - } - } - #endif - _actionsToAdd += action; unlock(); } diff --git a/libraries/physics/src/PhysicalEntitySimulation.cpp b/libraries/physics/src/PhysicalEntitySimulation.cpp index 874a68171a..f6f02b8573 100644 --- a/libraries/physics/src/PhysicalEntitySimulation.cpp +++ b/libraries/physics/src/PhysicalEntitySimulation.cpp @@ -251,16 +251,16 @@ void PhysicalEntitySimulation::addAction(EntityActionPointer action) { void PhysicalEntitySimulation::applyActionChanges() { if (_physicsEngine) { lock(); + foreach (QUuid actionToRemove, _actionsToRemove) { + _physicsEngine->removeAction(actionToRemove); + } + _actionsToRemove.clear(); foreach (EntityActionPointer actionToAdd, _actionsToAdd) { if (!_actionsToRemove.contains(actionToAdd->getID())) { _physicsEngine->addAction(actionToAdd); } } _actionsToAdd.clear(); - foreach (QUuid actionToRemove, _actionsToRemove) { - _physicsEngine->removeAction(actionToRemove); - } - _actionsToRemove.clear(); unlock(); } }