adjust how EntityMotionState updates its idea of what the server knows about an entity

Seth Alves committed 11 years ago

Commit 82bd5061 parent 5e4f30b2 files · +15 −11Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 2 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+10−11

                                           const QVariantMap& arguments) {
     QUuid actionID = QUuid::createUuid();
     auto actionFactory = DependencyManager::get<EntityActionFactoryInterface>();
-    bool success = true;
+    bool success = false;
     actionWorker(entityID, [&](EntitySimulation* simulation, EntityItemPointer entity) {
             // create this action even if the entity doesn't have physics info.  it will often be the
             // case that a script adds an action immediately after an object is created, and the physicsInfo
             // }
             EntityActionType actionType = EntityActionInterface::actionTypeFromString(actionTypeString);
             if (actionType == ACTION_TYPE_NONE) {
-                success = false;
                 return false;
             }
             EntityActionPointer action = actionFactory->factory(actionType, actionID, entity, arguments);
-            if (action) {
+            if (!action) {
-                success = entity->addAction(simulation, action);
+                return false;
-                auto nodeList = DependencyManager::get<NodeList>();
-                const QUuid myNodeID = nodeList->getSessionUUID();
-                if (entity->getSimulatorID() != myNodeID) {
-                    entity->flagForOwnership();
-                }
-                return false; // Physics will cause a packet to be sent, so don't send from here.
             }
-            return false;
+            success = entity->addAction(simulation, action);
+            auto nodeList = DependencyManager::get<NodeList>();
+            const QUuid myNodeID = nodeList->getSessionUUID();
+            if (entity->getSimulatorID() != myNodeID) {
+                entity->flagForOwnership();
+            }
+            return false; // Physics will cause a packet to be sent, so don't send from here.
         });
     if (success) {
         return actionID;

adjust how EntityMotionState updates its idea of what the server knows about an entity

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code