tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix dead alert (#4558)

Browse Source
This commit is contained in:
Leon Friedrich
2021-09-03 14:11:12 +10:00
committed by GitHub
parent e3cf87a106
commit c7cfc8a90c
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Alert/ServerAlertsComponent.cs
View File

@@ -61,17 +61,17 @@ namespace Content.Server.Alert
break;
}
if (!IsShowingAlert(msg.AlertType))
if (!IsShowingAlert(msg.Type))
{
Logger.DebugS("alert", "user {0} attempted to" +
" click alert {1} which is not currently showing for them",
player.Name, msg.AlertType);
player.Name, msg.Type);
break;
}
if (!AlertManager.TryGet(msg.AlertType, out var alert))
if (!AlertManager.TryGet(msg.Type, out var alert))
{
Logger.WarningS("alert", "unrecognized encoded alert {0}", msg.AlertType);
Logger.WarningS("alert", "unrecognized encoded alert {0}", msg.Type);
break;
}

14
Content.Shared/Alert/SharedAlertsComponent.cs
View File

@@ -87,9 +87,12 @@ namespace Content.Shared.Alert
{
if (AlertManager.TryGet(alertType, out var alert))
{
// Check whether the alert category we want to show is already being displayed, with the same type,
// severity, and cooldown.
if (_alerts.TryGetValue(alert.AlertKey, out var alertStateCallback) &&
alert.AlertType == alertType &&
alertStateCallback.Severity == severity && alertStateCallback.Cooldown == cooldown)
alertStateCallback.Type == alertType &&
alertStateCallback.Severity == severity &&
alertStateCallback.Cooldown == cooldown)
{
return;
}
@@ -98,7 +101,7 @@ namespace Content.Shared.Alert
_alerts.Remove(alert.AlertKey);
_alerts[alert.AlertKey] = new AlertState
{Cooldown = cooldown, Severity = severity};
{Cooldown = cooldown, Severity = severity, Type=alertType};
AfterShowAlert();
@@ -180,12 +183,12 @@ namespace Content.Shared.Alert
[Serializable, NetSerializable]
public class ClickAlertMessage : ComponentMessage
{
public readonly AlertType AlertType;
public readonly AlertType Type;
public ClickAlertMessage(AlertType alertType)
{
Directed = true;
AlertType = alertType;
Type = alertType;
}
}
@@ -194,5 +197,6 @@ namespace Content.Shared.Alert
{
public short? Severity;
public ValueTuple<TimeSpan, TimeSpan>? Cooldown;
public AlertType Type;
}
}