Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Inline Deleted

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 11:30:03 +01:00
parent 149707a566
commit b2035543e2
60 changed files with 94 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Inventory/Components/InventoryComponent.cs
View File

@@ -124,7 +124,7 @@ namespace Content.Server.Inventory.Components
}
var containedEntity = _slotContainers[slot].ContainedEntity;
if (containedEntity?.Deleted == true)
if ((containedEntity != null ? (!IoCManager.Resolve<IEntityManager>().EntityExists(containedEntity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(containedEntity.Uid).EntityLifeStage) >= EntityLifeStage.Deleted : null) == true)
{
_slotContainers.Remove(slot);
containedEntity = null;

2
Content.Server/Inventory/InventoryHelpers.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Server.Inventory
var user = inventory.Owner;
// Let's do nothing if the owner of the inventory has been deleted.
if (user.Deleted)
if ((!IoCManager.Resolve<IEntityManager>().EntityExists(user.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(user.Uid).EntityLifeStage) >= EntityLifeStage.Deleted)
return false;
// If we don't have that slot or there's already an item there, we do nothing.