Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

makes monitoralerttypes actually nullable

Browse Source
This commit is contained in:
vulppine
2022-08-22 12:06:30 -07:00
parent d774741121
commit a5cf4f9578
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs
View File

@@ -49,7 +49,7 @@ namespace Content.Server.Atmos.Monitor.Components
public HashSet<string> SyncWithTags { get; } = new(); public HashSet<string> SyncWithTags { get; } = new();
[DataField("monitorAlertTypes")] [DataField("monitorAlertTypes")]
public HashSet<AtmosMonitorThresholdType> MonitorAlertTypes { get; } = new(); public HashSet<AtmosMonitorThresholdType>? MonitorAlertTypes { get; }
/// <summary> /// <summary>
/// If this device should receive only. If it can only /// If this device should receive only. If it can only

2
Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
View File

@@ -83,7 +83,7 @@ namespace Content.Server.Atmos.Monitor.Systems
return; return;
} }
if (args.Data.TryGetValue(AlertTypes, out HashSet<AtmosMonitorThresholdType>? types)) if (args.Data.TryGetValue(AlertTypes, out HashSet<AtmosMonitorThresholdType>? types) && component.MonitorAlertTypes != null)
{ {
isValid = types.Any(type => component.MonitorAlertTypes.Contains(type)); isValid = types.Any(type => component.MonitorAlertTypes.Contains(type));