Inline TryGetComponent completely, for real

2021-12-03 14:17:01 +01:00
parent 2ff4ec65d5
commit 69b270017b
425 changed files with 1143 additions and 995 deletions
--- a/Content.Server/Engineering/EntitySystems/DisassembleOnActivateSystem.cs
+++ b/Content.Server/Engineering/EntitySystems/DisassembleOnActivateSystem.cs
@@ -46,8 +46,8 @@ namespace Content.Server.Engineering.EntitySystems

            var entity = EntityManager.SpawnEntity(component.Prototype, component.Owner.Transform.Coordinates);

-            if (args.User.TryGetComponent<HandsComponent>(out var hands)
-                && entity.TryGetComponent<ItemComponent>(out var item))
+            if (IoCManager.Resolve<IEntityManager>().TryGetComponent<HandsComponent?>(args.User.Uid, out var hands)
+                && IoCManager.Resolve<IEntityManager>().TryGetComponent<ItemComponent?>(entity.Uid, out var item))
            {
                hands.PutInHandOrDrop(item);
            }