From 1086474cd0bfe188e80b1f9d330a495c9a860009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Aguilera=20Puerto?= Date: Fri, 21 Aug 2020 20:29:29 +0200 Subject: [PATCH] Do not spawn the item in nullspace in InventoryHelpers --- Content.Server/Utility/InventoryHelpers.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Content.Server/Utility/InventoryHelpers.cs b/Content.Server/Utility/InventoryHelpers.cs index ec6bb9e851..ec998908ac 100644 --- a/Content.Server/Utility/InventoryHelpers.cs +++ b/Content.Server/Utility/InventoryHelpers.cs @@ -15,9 +15,10 @@ namespace Content.Server.Utility { var entityManager = inventory.Owner.EntityManager; var protoManager = IoCManager.Resolve(); + var user = inventory.Owner; // Let's do nothing if the owner of the inventory has been deleted. - if (inventory.Owner.Deleted) + if (user.Deleted) return false; // If we don't have that slot or there's already an item there, we do nothing. @@ -28,8 +29,8 @@ namespace Content.Server.Utility if (!protoManager.HasIndex(prototype)) return false; - // Let's spawn this in nullspace first... - var item = entityManager.SpawnEntity(prototype, MapCoordinates.Nullspace); + // Let's spawn this first... + var item = entityManager.SpawnEntity(prototype, user.Transform.MapPosition); // Helper method that deletes the item and returns false. bool DeleteItem()