Inline GetComponentOrNull

2021-12-03 15:32:05 +01:00
parent ee4ff9cfe8
commit 2654775bf0
30 changed files with 55 additions and 32 deletions
--- a/Content.Server/Inventory/Components/InventoryComponent.cs
+++ b/Content.Server/Inventory/Components/InventoryComponent.cs
@@ -112,7 +112,7 @@ namespace Content.Server.Inventory.Components
        public IEnumerable<T?> LookupItems<T>() where T : Component
        {
            return _slotContainers.Values
-                .SelectMany(x => x.ContainedEntities.Select(e => e.GetComponentOrNull<T>()))
+                .SelectMany(x => x.ContainedEntities.Select(e => IoCManager.Resolve<IEntityManager>().GetComponentOrNull<T>(e.Uid)))
                .Where(x => x != null);
        }