(e97fbee9a) Merge branch 'human-ai' of https://github.com/Regalis11/Barotrauma-development into human-ai

2019-05-16 05:42:15 +03:00
parent a7a4a56635
commit 153fbca298
12 changed files with 359 additions and 80 deletions
@@ -48,7 +48,10 @@ namespace Barotrauma
            this.useController = useController;
            if (useController)
            {
-                controller = component.Item.GetConnectedComponents<Controller>().FirstOrDefault();
+                //try finding the controller with the simpler non-recursive method first
+                controller =
+                        component.Item.GetConnectedComponents<Controller>().FirstOrDefault() ??
+                        component.Item.GetConnectedComponents<Controller>(recursive: true).FirstOrDefault();
            }
        }

@@ -91,6 +94,10 @@ namespace Barotrauma
                    {
                        isCompleted = true;
                    }
+                    if (component.AIOperate(deltaTime, character, this))
+                    {
+                        isCompleted = true;
+                    }
                }
                else
                {