(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
@@ -140,7 +140,10 @@ namespace Barotrauma
            {
                if (UseController)
                {
-                    ConnectedController = targetItem.Item.GetConnectedComponents<Controller>().FirstOrDefault();
+                    //try finding the controller with the simpler non-recursive method first
+                    ConnectedController = 
+                        targetItem.Item.GetConnectedComponents<Controller>().FirstOrDefault() ?? 
+                        targetItem.Item.GetConnectedComponents<Controller>(recursive: true).FirstOrDefault();
                }
                TargetEntity = targetItem.Item;
                TargetItemComponent = targetItem;