From a5cf4f9578ed177d47664a777529c38be3806c99 Mon Sep 17 00:00:00 2001 From: vulppine Date: Mon, 22 Aug 2022 12:06:30 -0700 Subject: [PATCH] makes monitoralerttypes actually nullable --- .../Atmos/Monitor/Components/AtmosAlarmableComponent.cs | 2 +- Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs b/Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs index 1f62b6fd26..95918030c9 100644 --- a/Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs +++ b/Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs @@ -49,7 +49,7 @@ namespace Content.Server.Atmos.Monitor.Components public HashSet SyncWithTags { get; } = new(); [DataField("monitorAlertTypes")] - public HashSet MonitorAlertTypes { get; } = new(); + public HashSet? MonitorAlertTypes { get; } /// /// If this device should receive only. If it can only diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs index 11272d74fd..ee623251b8 100644 --- a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs +++ b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs @@ -83,7 +83,7 @@ namespace Content.Server.Atmos.Monitor.Systems return; } - if (args.Data.TryGetValue(AlertTypes, out HashSet? types)) + if (args.Data.TryGetValue(AlertTypes, out HashSet? types) && component.MonitorAlertTypes != null) { isValid = types.Any(type => component.MonitorAlertTypes.Contains(type));