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

Fix ContactInteractionEvent exceptions (#12314)

Browse Source
This commit is contained in:
Leon Friedrich
2022-10-31 19:35:35 +13:00
committed by GitHub
parent 8c73cfb06d
commit 7a1ebc6c97
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Interaction/SharedInteractionSystem.cs
View File

@@ -1013,6 +1013,10 @@ namespace Content.Shared.Interaction
if (uidB == null || args?.Handled == false) if (uidB == null || args?.Handled == false)
return; return;
// Entities may no longer exist (banana was eaten, or human was exploded)?
if (!Exists(uidA) || !Exists(uidB))
return;
RaiseLocalEvent(uidA, new ContactInteractionEvent(uidB.Value)); RaiseLocalEvent(uidA, new ContactInteractionEvent(uidB.Value));
RaiseLocalEvent(uidB.Value, new ContactInteractionEvent(uidA)); RaiseLocalEvent(uidB.Value, new ContactInteractionEvent(uidA));
} }