diff --git a/Content.Server/Storage/Components/ServerStorageComponent.cs b/Content.Server/Storage/Components/ServerStorageComponent.cs index b553f38e11..deb7e82f5c 100644 --- a/Content.Server/Storage/Components/ServerStorageComponent.cs +++ b/Content.Server/Storage/Components/ServerStorageComponent.cs @@ -543,11 +543,11 @@ namespace Content.Server.Storage.Components || entity == eventArgs.User || !entity.HasComponent()) continue; - var coords = entity.Transform.Coordinates; + var position = EntityCoordinates.FromMap(Owner.Transform.Parent?.Owner ?? Owner, entity.Transform.MapPosition); if (PlayerInsertEntityInWorld(eventArgs.User, entity)) { successfullyInserted.Add(entity.Uid); - successfullyInsertedPositions.Add(coords); + successfullyInsertedPositions.Add(position); } } @@ -572,7 +572,7 @@ namespace Content.Server.Storage.Components || eventArgs.Target == eventArgs.User || !eventArgs.Target.HasComponent()) return false; - var position = eventArgs.Target.Transform.Coordinates; + var position = EntityCoordinates.FromMap(Owner.Transform.Parent?.Owner ?? Owner, eventArgs.Target.Transform.MapPosition); if (PlayerInsertEntityInWorld(eventArgs.User, eventArgs.Target)) { SendNetworkMessage(new AnimateInsertingEntitiesMessage(