From 5a03c0eca80bc44c27f1fc24cda0749288fdd72b Mon Sep 17 00:00:00 2001 From: E F R <602406+Efruit@users.noreply.github.com> Date: Wed, 20 Oct 2021 13:25:22 +0000 Subject: [PATCH] Storage: fix Storage insert anim with _quickInsert or _areaInsert set (#4877) Turns out the final position calculations were wrong, so I copied/pasted from the equivalent parts of the Hands components. Unfortunately, this means that picking up trash with a trash bag no longer causes said trash to rapidly zoom to 0,0. --- Content.Server/Storage/Components/ServerStorageComponent.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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(