(deee8cd6d) Merge branch 'dev' into human-ai

2019-05-16 05:23:20 +03:00
parent abd19f614f
commit 053ef60fc4
14 changed files with 176 additions and 396 deletions
@@ -92,7 +92,7 @@ namespace Barotrauma
                {
                    if (character.CurrentHull == target.Item.CurrentHull)
                    {
-                        if (character.SelectedConstruction != target.Item && target.CanBeSelected)
+                        if (character.SelectedConstruction != target.Item)
                        {
                            target.Item.TryInteract(character, false, true);
                        }
@@ -102,12 +102,6 @@ namespace Barotrauma
                        }
                        return;
                    }
-
-                    if (component.AIOperate(deltaTime, character, this))
-                    {
-                        isCompleted = true;
-                    }
-                    return;
                }

                AddSubObjective(gotoObjective = new AIObjectiveGoTo(target.Item, character, objectiveManager));