From 8f3c58de4b27f6619e3eca920a34c960e91cbffa Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Wed, 5 Jul 2017 17:39:30 +0300 Subject: [PATCH] Fixed null exceptions when selecting a sonar in a sub with no hulls --- .../BarotraumaClient/Source/Items/Components/Machines/Radar.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Radar.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Radar.cs index 3539b545c..54ea185e9 100644 --- a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Radar.cs +++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Radar.cs @@ -82,6 +82,7 @@ namespace Barotrauma.Items.Components foreach (Submarine submarine in Submarine.Loaded) { if (submarine != item.Submarine && !submarine.DockedTo.Contains(item.Submarine)) continue; + if (submarine.HullVertices == null) continue; Vector2 offset = ConvertUnits.ToSimUnits(submarine.WorldPosition - item.WorldPosition);