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

checks for validity now ensure that an alarm is reset to normal - only if it was known beforehand

Browse Source
This commit is contained in:
vulppine
2022-08-22 18:06:41 -07:00
parent 546e70730e
commit b8d011f8f4
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,26 +88,30 @@ namespace Content.Server.Atmos.Monitor.Systems
// the maximum alarm state at all times. // the maximum alarm state at all times.
if (!args.Data.TryGetValue(DeviceNetworkConstants.CmdSetState, out AtmosMonitorAlarmType state)) if (!args.Data.TryGetValue(DeviceNetworkConstants.CmdSetState, out AtmosMonitorAlarmType state))
{ {
return; break;
} }
if (args.Data.TryGetValue(AlertTypes, out HashSet<AtmosMonitorThresholdType>? types) && component.MonitorAlertTypes != null) 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));
if (!isValid)
{
break;
}
} }
if (!component.NetworkAlarmStates.ContainsKey(args.SenderAddress)) if (!component.NetworkAlarmStates.ContainsKey(args.SenderAddress))
{ {
if (!isValid)
{
break;
}
component.NetworkAlarmStates.Add(args.SenderAddress, state); component.NetworkAlarmStates.Add(args.SenderAddress, state);
} }
else else
{ {
component.NetworkAlarmStates[args.SenderAddress] = state; // This is because if the alert is no longer valid,
// it may mean that the threshold we need to look at has
// been removed from the threshold types passed:
// basically, we need to reset this state to normal here.
component.NetworkAlarmStates[args.SenderAddress] = isValid ? state : AtmosMonitorAlarmType.Normal;
} }
if (!TryGetHighestAlert(uid, out var netMax, component)) if (!TryGetHighestAlert(uid, out var netMax, component))