From fdd6850743248a3fbd320c2c6b7958ea95c66b0e Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Sun, 9 Jun 2019 17:43:44 +0300 Subject: [PATCH] (090ca8617) Fixed AIObjectiveFindSafety crashing when inside a hull that doesn't belong to any sub (e.g. in ruins). Closes #1542 --- .../Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs index 3cdc8780b..80bfc0544 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs @@ -196,7 +196,7 @@ namespace Barotrauma if (ignoredHulls != null && ignoredHulls.Contains(hull)) { continue; } if (unreachable.Contains(hull)) { continue; } float hullSafety = 0; - if (character.CurrentHull != null) + if (character.CurrentHull != null && character.Submarine != null) { // Inside if (!character.Submarine.IsConnectedTo(hull.Submarine)) { continue; }