don't add an action of we're about to remove it

This commit is contained in:
Seth Alves 2015-06-22 13:11:42 -07:00
parent bce8b0cc1b
commit 55975fd611

View file

@ -239,7 +239,9 @@ void PhysicalEntitySimulation::applyActionChanges() {
if (_physicsEngine) {
lock();
foreach (EntityActionPointer actionToAdd, _actionsToAdd) {
_physicsEngine->addAction(actionToAdd);
if (!_actionsToRemove.contains(actionToAdd->getID())) {
_physicsEngine->addAction(actionToAdd);
}
}
_actionsToAdd.clear();
foreach (QUuid actionToRemove, _actionsToRemove) {