Unstable 0.13.3.11

2021-04-28 16:10:00 +03:00
parent bf743f1e99
commit 3f324b14e8
18 changed files with 60 additions and 53 deletions
@@ -442,7 +442,7 @@ namespace Barotrauma
                        Character.AnimController.InWater ||
                        Character.AnimController.HeadInWater ||
                        Character.CurrentHull == null ||
-                        Character.Submarine.TeamID != Character.TeamID ||
+                        Character.Submarine?.TeamID != Character.TeamID ||
                        ObjectiveManager.IsCurrentObjective<AIObjectiveFindSafety>() ||
                        ObjectiveManager.CurrentOrder is AIObjectiveGoTo goTo && goTo.Target == Character ||   // wait order
                        ObjectiveManager.CurrentObjective.GetSubObjectivesRecursive(true).Any(o => o.KeepDivingGearOn);