From 2d55d413202c63660c8151d70424cc55faf42e6a Mon Sep 17 00:00:00 2001 From: juanjp600 Date: Fri, 1 Dec 2017 09:53:07 -0300 Subject: [PATCH] Fixed railgun HUD crash when the first linked item doesn't have an ItemContainer --- .gitignore | 1 + Barotrauma/BarotraumaShared/Source/Items/Components/Turret.cs | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index c0d9a49c6..b9164d63b 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ bld/ #performance reports & sessions *.vsp *.psess +.vs/ diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Turret.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Turret.cs index 2c24e4926..5d3563d18 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Components/Turret.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Turret.cs @@ -347,6 +347,9 @@ namespace Barotrauma.Items.Components if (returnNull) { var itemContainer = projectileContainer.GetComponent(); + if (itemContainer == null) continue; + if (itemContainer.Inventory == null) continue; + if (itemContainer.Inventory.Items == null) continue; for (int i = 0; i < itemContainer.Inventory.Items.Length; i++) { projectiles.Add(itemContainer.Inventory.Items[i]?.GetComponent());