Misc changes from replay branch (#12581)

2022-11-15 19:34:47 +13:00
parent a2183fc223
commit 94011ca2b1
12 changed files with 21 additions and 12 deletions
--- a/Content.Shared/Verbs/SharedVerbSystem.cs
+++ b/Content.Shared/Verbs/SharedVerbSystem.cs
@@ -168,6 +168,9 @@ namespace Content.Shared.Verbs
                    RaiseLocalEvent(verb.ExecutionEventArgs);
            }

+            if (Deleted(user) || Deleted(target))
+                return;
+
            // Perform any contact interactions
            if (verb.DoContactInteraction ?? (verb.DefaultDoContactInteraction && _interactionSystem.InRangeUnobstructed(user, target)))
                _interactionSystem.DoContactInteraction(user, target);