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.Shared/Strip/Components/SharedStrippableComponent.cs
+++ b/Content.Shared/Strip/Components/SharedStrippableComponent.cs
@@ -4,6 +4,7 @@ using Content.Shared.ActionBlocker;
 using Content.Shared.DragDrop;
 using Content.Shared.Hands.Components;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Serialization;
 using static Content.Shared.Inventory.EquipmentSlotDefines;

@@ -16,7 +17,7 @@ namespace Content.Shared.Strip.Components
        public bool CanBeStripped(IEntity by)
        {
            return by != Owner
-                   && by.HasComponent<SharedHandsComponent>()
+                   && IoCManager.Resolve<IEntityManager>().HasComponent<SharedHandsComponent>(@by.Uid)
                   && EntitySystem.Get<ActionBlockerSystem>().CanInteract(by.Uid);
        }