vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed nullref exceptions in CharacterHUD & RuinGenerator

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-07-20 11:36:53 +03:00
parent f13b1b4d84
commit 8e03ac9284
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs
+1 -1
View File
@@ -32,7 +32,7 @@ namespace Barotrauma
public static void TakeDamage(float amount) public static void TakeDamage(float amount)
{ {
healthBar.Flash(); healthBar?.Flash();
damageOverlayTimer = MathHelper.Clamp(amount * 0.1f, 0.2f, 1.0f); damageOverlayTimer = MathHelper.Clamp(amount * 0.1f, 0.2f, 1.0f);
} }
Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/RuinGenerator.cs
+1
View File
@@ -423,6 +423,7 @@ namespace Barotrauma.RuinGeneration
Alignment[] alignments = new Alignment[] { Alignment.Top, Alignment.Bottom, Alignment.Right, Alignment.Left, Alignment.Center }; 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)]); 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; Vector2 size = (prop.Prefab is StructurePrefab) ? ((StructurePrefab)prop.Prefab).Size : Vector2.Zero;