Merge branch 'master' into cvar-requirement

Simple-Station · Dec 9, 2024 · b3a700e · b3a700e
2 parents dd65361 + ca7e576
commit b3a700e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -1314,7 +1314,8 @@ public void DoContactInteraction(EntityUid uidA, EntityUid? uidB, HandledEntityE
             if (uidB == null || args?.Handled == false)
                 return;
 
-            DebugTools.AssertNotEqual(uidA, uidB.Value);
+            if (uidA == uidB.Value)
+                return;
 
             if (!TryComp(uidA, out MetaDataComponent? metaA) || metaA.EntityPaused)
                 return;