cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix null ref exception in PrayerSystem (#28712) 

* 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 null
parent 8deaea3a94
commit 5e2e85fbd4
No known key found for this signature in database
GPG Key ID: 212F05528FD678BE
1 changed files with 3 additions and 1 deletions
Show Stats 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,