Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

2024-01-11 11:42:33 -03:00
parent 8b3d8ba027 27bceae853
commit 40beade15a
20 changed files with 263 additions and 137 deletions
@@ -255,7 +255,11 @@ namespace Barotrauma
                }
                if (subObjectives.Any(so => so.CanBeCompleted)) { return; }
                UpdateSimpleEscape(deltaTime);
-                if (cannotFindSafeHull && !character.IsInFriendlySub && objectiveManager.Objectives.None(o => o is AIObjectiveReturn))
+
+                bool inFriendlySub = 
+                    character.IsInFriendlySub || 
+                    (character.IsEscorted && character.IsInPlayerSub);
+                if (cannotFindSafeHull && !inFriendlySub && objectiveManager.Objectives.None(o => o is AIObjectiveReturn))
                {
                    if (OrderPrefab.Prefabs.TryGet("return".ToIdentifier(), out OrderPrefab orderPrefab))
                    {