From 496cf5975a2450ec1a3f6cfa07a81ea0fb29a7f1 Mon Sep 17 00:00:00 2001 From: Aviu00 Date: Fri, 19 Jan 2024 11:48:35 +0300 Subject: [PATCH] Null list --- .../White/EntityHealthBar/EntityHealthBarOverlay.cs | 4 ++-- .../White/EntityHealthBar/ShowHealthBarsComponent.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Content.Client/White/EntityHealthBar/EntityHealthBarOverlay.cs b/Content.Client/White/EntityHealthBar/EntityHealthBarOverlay.cs index 201448bedb..c202e4e1e3 100644 --- a/Content.Client/White/EntityHealthBar/EntityHealthBarOverlay.cs +++ b/Content.Client/White/EntityHealthBar/EntityHealthBarOverlay.cs @@ -25,7 +25,7 @@ public sealed class EntityHealthBarOverlay : Overlay private readonly MobThresholdSystem _mobThresholdSystem; private readonly Texture _barTexture; public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV; - public List DamageContainers = new(); + public List? DamageContainers; // for icon frame change timer int iconFrame = 1; double delayTime = 0.25; @@ -70,7 +70,7 @@ public sealed class EntityHealthBarOverlay : Overlay continue; } - if (dmg.DamageContainerID == null || !DamageContainers.Contains(dmg.DamageContainerID)) + if (dmg.DamageContainerID == null || DamageContainers != null && !DamageContainers.Contains(dmg.DamageContainerID)) continue; var worldPosition = _transform.GetWorldPosition(xform); diff --git a/Content.Shared/White/EntityHealthBar/ShowHealthBarsComponent.cs b/Content.Shared/White/EntityHealthBar/ShowHealthBarsComponent.cs index 1013f5b1ee..0feae82ad8 100644 --- a/Content.Shared/White/EntityHealthBar/ShowHealthBarsComponent.cs +++ b/Content.Shared/White/EntityHealthBar/ShowHealthBarsComponent.cs @@ -15,6 +15,6 @@ namespace Content.Shared.EntityHealthBar /// [DataField("damageContainers", customTypeSerializer: typeof(PrototypeIdListSerializer))] - public List DamageContainers = new(); + public List? DamageContainers; } }