From 555043f997becb2050efe031cfe57df6447fec25 Mon Sep 17 00:00:00 2001
From: Vera Aguilera Puerto <gradientvera@outlook.com>
Date: Thu, 19 Aug 2021 11:14:38 +0200
Subject: [PATCH] Improve hand pickup code This way I can break
 EntityCoordinates' API without breaking content. BWAHAHAHAHAH!

---
 Content.Server/Hands/Components/HandsComponent.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Hands/Components/HandsComponent.cs b/Content.Server/Hands/Components/HandsComponent.cs
index ccd22ab623..4fdb02afc2 100644
--- a/Content.Server/Hands/Components/HandsComponent.cs
+++ b/Content.Server/Hands/Components/HandsComponent.cs
@@ -90,7 +90,7 @@ namespace Content.Server.Hands.Components
 
         protected override void HandlePickupAnimation(IEntity entity)
         {
-            var initialPosition = EntityCoordinates.FromMap(Owner.Transform.Coordinates.GetParent(Owner.EntityManager), entity.Transform.MapPosition);
+            var initialPosition = EntityCoordinates.FromMap(Owner.Transform.Parent?.Owner ?? Owner, entity.Transform.MapPosition);
 
             var finalPosition = Owner.Transform.Coordinates.Position;