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

Fix null ref exception in PrayerSystem (#28712)

Browse Source 
* Fix null ref exception in PrayerSystem

* Also check that prayable ent/comp still exist
This commit is contained in:
Tayrtahn
2024-06-08 14:50:20 -04:00
committed by GitHub
parent cce50da170
commit 7f686a6ae5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Prayer/PrayerSystem.cs
View File

@@ -56,7 +56,9 @@ public sealed class PrayerSystem : EntitySystem
_quickDialog.OpenDialog(actor.PlayerSession, Loc.GetString(comp.Verb), Loc.GetString("prayer-popup-notify-pray-ui-message"), (string message) =>
{
Pray(actor.PlayerSession, comp, message);
// Make sure the player's entity and the Prayable entity+component still exist
if (actor?.PlayerSession != null && HasComp<PrayableComponent>(uid))
Pray(actor.PlayerSession, comp, message);
});
},
Impact = LogImpact.Low,