(86c9256b3) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveGoTo.cs

@@ -117,7 +117,7 @@ namespace Barotrauma
                 // Take the sub position into account in the sim pos
                 if (character.Submarine == null && Target.Submarine != null)
                 {
-                    currTargetSimPos += Target.Submarine.SimPosition;
+                    //currTargetSimPos += Target.Submarine.SimPosition;
                 }
                 else if (character.Submarine != null && Target.Submarine == null)
                 {
@@ -159,7 +159,6 @@ namespace Barotrauma
             // First check the distance
             // Then the custom condition
             // And finally check if can interact (heaviest)
-            if (repeat) { return false; }
             if (isCompleted) { return true; }
             if (Target == null)
             {
@@ -167,7 +166,16 @@ namespace Barotrauma
                 return false;
             }
             bool closeEnough = Vector2.DistanceSquared(Target.WorldPosition, character.WorldPosition) < CloseEnough * CloseEnough;
-            if (closeEnough)
+            if (repeat)
+            {
+                if (closeEnough)
+                {
+                    character.AIController.SteeringManager.Reset();
+                    character.AnimController.TargetDir = Target.WorldPosition.X > character.WorldPosition.X ? Direction.Right : Direction.Left;
+                }
+                return false;
+            }
+            else if (closeEnough)
             {
                 if (customCondition == null || customCondition())
                 {
@@ -175,7 +183,7 @@ namespace Barotrauma
                     {
                         if (character.CanInteractWith(item, out _, checkLinked: false)) { isCompleted = true; }
                     }
-                    else if (Target is Character targetCharacter && !FollowControlledCharacter)
+                    else if (Target is Character targetCharacter)
                     {
                         if (character.CanInteractWith(targetCharacter, CloseEnough)) { isCompleted = true; }
                     }