(97c11681e) Abandon the operate item objective if the controller is not found.

2019-05-16 05:36:23 +03:00
parent 8280ed9c1a
commit 28eef39b64
12 changed files with 226 additions and 218 deletions
@@ -49,8 +49,7 @@ namespace Barotrauma
            this.useController = useController;
            if (useController)
            {
-                var controllers = component.Item.GetConnectedComponents<Controller>();
-                if (controllers.Any()) controller = controllers[0];
+                controller = component.Item.GetConnectedComponents<Controller>().FirstOrDefault();
            }
        }

@@ -60,6 +59,7 @@ namespace Barotrauma
            if (useController && controller == null)
            {
                character.Speak(TextManager.Get("DialogCantFindController").Replace("[item]", component.Item.Name), null, 2.0f, "cantfindcontroller", 30.0f);
+                abandon = true;
                return;
            }
            if (target.CanBeSelected)
@@ -116,6 +116,10 @@ namespace Barotrauma
                    {
                        isCompleted = true;
                    }
+                    if (component.AIOperate(deltaTime, character, this))
+                    {
+                        isCompleted = true;
+                    }
                }
                else
                {