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/Chat/Commands/SuicideCommand.cs
+++ b/Content.Server/Chat/Commands/SuicideCommand.cs
@@ -107,7 +107,7 @@ namespace Content.Server.Chat.Commands
            {
                foreach (var entity in entities)
                {
-                    if (entity.HasComponent<ItemComponent>())
+                    if (IoCManager.Resolve<IEntityManager>().HasComponent<ItemComponent>(entity.Uid))
                        continue;
                    var suicide = IoCManager.Resolve<IEntityManager>().GetComponents<ISuicideAct>(entity.Uid).FirstOrDefault();
                    if (suicide != null)