Inline HasComponent entirely

2021-12-03 12:23:18 +01:00
parent 88141ae6b8
commit 0feebbff00
117 changed files with 201 additions and 158 deletions
--- a/Content.Server/Conveyor/ConveyorSystem.cs
+++ b/Content.Server/Conveyor/ConveyorSystem.cs
@@ -106,7 +106,7 @@ namespace Content.Server.Conveyor
                return false;
            }

-            if (component.Owner.HasComponent<ItemComponent>())
+            if (IoCManager.Resolve<IEntityManager>().HasComponent<ItemComponent>(component.Owner.Uid))
            {
                return false;
            }
@@ -150,7 +150,7 @@ namespace Content.Server.Conveyor
                    continue;
                }

-                if (entity.HasComponent<IMapGridComponent>())
+                if (IoCManager.Resolve<IEntityManager>().HasComponent<IMapGridComponent>(entity.Uid))
                {
                    continue;
                }