From 8e03ac928444477a5ac1dde2bc84907b8b2a42dc Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Fri, 20 Jul 2018 11:36:53 +0300 Subject: [PATCH] Fixed nullref exceptions in CharacterHUD & RuinGenerator --- Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs | 2 +- .../BarotraumaShared/Source/Map/Levels/Ruins/RuinGenerator.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs b/Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs index 295d54d8c..bf6677e4c 100644 --- a/Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs +++ b/Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs @@ -32,7 +32,7 @@ namespace Barotrauma public static void TakeDamage(float amount) { - healthBar.Flash(); + healthBar?.Flash(); damageOverlayTimer = MathHelper.Clamp(amount * 0.1f, 0.2f, 1.0f); } diff --git a/Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/RuinGenerator.cs b/Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/RuinGenerator.cs index 1f7e758dd..ad9c9a4d0 100644 --- a/Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/RuinGenerator.cs +++ b/Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/RuinGenerator.cs @@ -423,6 +423,7 @@ namespace Barotrauma.RuinGeneration Alignment[] alignments = new Alignment[] { Alignment.Top, Alignment.Bottom, Alignment.Right, Alignment.Left, Alignment.Center }; var prop = RuinStructure.GetRandom(RuinStructureType.Prop, alignments[Rand.Int(alignments.Length, Rand.RandSync.Server)]); + if (prop == null) continue; Vector2 size = (prop.Prefab is StructurePrefab) ? ((StructurePrefab)prop.Prefab).Size : Vector2.Zero;