(0e668e083) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev (squashed together 20290af96..0e668e083 because the merge script shit itself due to the merges in between)

2019-05-20 20:25:12 +03:00
parent d43b3737c8
commit 97b095bd10
32 changed files with 169 additions and 27 deletions
@@ -25,7 +25,6 @@ namespace Barotrauma
        public float CloseEnough { get; set; } = 50;
        public bool IgnoreIfTargetDead { get; set; }
        public bool AllowGoingOutside { get; set; }
-        public bool CheckVisibility { get; set; }

        public ISpatialEntity Target { get; private set; }

@@ -92,11 +91,18 @@ namespace Barotrauma
            {
                abandon = true;
            }
-            else if (!repeat && waitUntilPathUnreachable < 0)
+            else if (waitUntilPathUnreachable < 0)
            {
-                if (SteeringManager == PathSteering && PathSteering.CurrentPath != null)
+                if (SteeringManager == PathSteering && PathSteering.CurrentPath != null && PathSteering.CurrentPath.Unreachable)
                {
-                    abandon = PathSteering.CurrentPath.Unreachable;
+                    if (repeat)
+                    {
+                        SteeringManager.Reset();
+                    }
+                    else
+                    {
+                        abandon = true;
+                    }
                }
            }
            if (abandon)