Fix clientsided alerts being overwritten by server (#37033)

Initial commit
This commit is contained in:
SlamBamActionman
2025-04-29 15:32:18 +02:00
committed by GitHub
parent 74a8bb9509
commit aa29712a65
3 changed files with 23 additions and 0 deletions

View File

@@ -52,8 +52,24 @@ public sealed class ClientAlertsSystem : AlertsSystem
if (args.Current is not AlertComponentState cast)
return;
// Save all client-sided alerts to later put back in
var clientAlerts = new Dictionary<AlertKey, AlertState>();
foreach (var alert in alerts.Comp.Alerts)
{
if (alert.Key.AlertType != null && TryGet(alert.Key.AlertType.Value, out var alertProto))
{
if (alertProto.ClientHandled)
clientAlerts[alert.Key] = alert.Value;
}
}
alerts.Comp.Alerts = new(cast.Alerts);
foreach (var alert in clientAlerts)
{
alerts.Comp.Alerts[alert.Key] = alert.Value;
}
UpdateHud(alerts);
}