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/Throwing/ThrowHelper.cs
+++ b/Content.Server/Throwing/ThrowHelper.cs
@@ -46,14 +46,14 @@ namespace Content.Server.Throwing
                return;
            }

-            if (entity.HasComponent<MobStateComponent>())
+            if (IoCManager.Resolve<IEntityManager>().HasComponent<MobStateComponent>(entity.Uid))
            {
                Logger.Warning("Throwing not supported for mobs!");
                return;
            }

            var comp = entity.EnsureComponent<ThrownItemComponent>();
-            if (entity.HasComponent<ItemComponent>())
+            if (IoCManager.Resolve<IEntityManager>().HasComponent<ItemComponent>(entity.Uid))
            {
                comp.Thrower = user;
                // Give it a l'il spin.