From e16cfc9aeedd5494eb57a9ec1578fc49dd651949 Mon Sep 17 00:00:00 2001
From: EmoGarbage404 <retron404@gmail.com>
Date: Tue, 16 Apr 2024 20:07:59 -0400
Subject: [PATCH] weh

---
 Lidgren.Network/Lidgren.Network                           | 2 +-
 .../Systems/SharedTransformSystem.Component.cs            | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Lidgren.Network/Lidgren.Network b/Lidgren.Network/Lidgren.Network
index 45f89ca2639..61a56c60bd9 160000
--- a/Lidgren.Network/Lidgren.Network
+++ b/Lidgren.Network/Lidgren.Network
@@ -1 +1 @@
-Subproject commit 45f89ca2639ec05d4700691a1160fccd79cb4c86
+Subproject commit 61a56c60bd99d000c25bd3f105b6de090076c98f
diff --git a/Robust.Shared/GameObjects/Systems/SharedTransformSystem.Component.cs b/Robust.Shared/GameObjects/Systems/SharedTransformSystem.Component.cs
index 7ac8baa3040..32be8c70fde 100644
--- a/Robust.Shared/GameObjects/Systems/SharedTransformSystem.Component.cs
+++ b/Robust.Shared/GameObjects/Systems/SharedTransformSystem.Component.cs
@@ -1534,12 +1534,12 @@ public bool SwapPositions(Entity<TransformComponent?> entity1, Entity<TransformC
         MapCoordinates? pos2 = null;
 
         if (_container.TryGetContainingContainer(entity1, out var container1))
-            _container.TryRemoveFromContainer(entity1, true);
+            _container.Remove(entity1, container1, force: true);
         else
             pos1 = GetMapCoordinates(entity1.Comp);
 
         if (_container.TryGetContainingContainer(entity2, out var container2))
-            _container.TryRemoveFromContainer(entity2, true);
+            _container.Remove(entity2, container2, force: true);
         else
             pos2 = GetMapCoordinates(entity2.Comp);
 
@@ -1559,7 +1559,7 @@ public bool SwapPositions(Entity<TransformComponent?> entity1, Entity<TransformC
 
             if (!_gridQuery.HasComponent(entity1) && _mapManager.TryFindGridAt(mapUid, pos2.Value.Position, out var targetGrid, out _))
             {
-                var (_, _, invWorldMatrix) = GetWorldPositionRotationInvMatrix(targetGrid);
+                var invWorldMatrix = GetInvWorldMatrix(targetGrid);
                 SetCoordinates(entity1, new EntityCoordinates(targetGrid, invWorldMatrix.Transform(pos2.Value.Position)));
             }
             else
@@ -1582,7 +1582,7 @@ public bool SwapPositions(Entity<TransformComponent?> entity1, Entity<TransformC
 
             if (!_gridQuery.HasComponent(entity1) && _mapManager.TryFindGridAt(mapUid, pos1.Value.Position, out var targetGrid, out _))
             {
-                var (_, _, invWorldMatrix) = GetWorldPositionRotationInvMatrix(targetGrid);
+                var invWorldMatrix = GetInvWorldMatrix(targetGrid);
                 SetCoordinates(entity2, new EntityCoordinates(targetGrid, invWorldMatrix.Transform(pos1.Value.Position)));
             }
             else