Fix ContactInteractionEvent exceptions (#12314)

2022-10-31 19:35:35 +13:00
parent 8c73cfb06d
commit 7a1ebc6c97
1 changed files with 4 additions and 0 deletions
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -1013,6 +1013,10 @@ namespace Content.Shared.Interaction
            if (uidB == null || args?.Handled == false)
                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(uidB.Value, new ContactInteractionEvent(uidA));
        }