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

Fix server NRE on clicking alerts with no OnClick (#2748)

Browse Source 
* #2744 fix NRE on clicking alerts with no OnClick, and don't send the click
message unless the alert has an onclick

* #2744 fix NRE on clicking alerts with no OnClick, and don't send the click
message unless the alert has an onclick
This commit is contained in:
chairbender
2020-12-16 03:13:57 -08:00
committed by GitHub
parent 49e6db2b87
commit 27d5019df0
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameObjects/Components/Mobs/ServerAlertsComponent.cs
View File

@@ -71,7 +71,7 @@ namespace Content.Server.GameObjects.Components.Mobs
break;
}
if (AlertManager.TryGet(msg.AlertType, out var alert))
if (AlertManager.TryGet(msg.AlertType, out var alert) && alert.OnClick != null)
{
alert.OnClick.AlertClicked(new ClickAlertEventArgs(player, alert));
}