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/Explosion/Components/ClusterFlashComponent.cs
+++ b/Content.Server/Explosion/Components/ClusterFlashComponent.cs
@@ -60,7 +60,7 @@ namespace Content.Server.Explosion.Components
        async Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs args)
        {
            if (_grenadesContainer.ContainedEntities.Count >= _maxGrenades ||
-                !args.Using.HasComponent<FlashOnTriggerComponent>())
+                !IoCManager.Resolve<IEntityManager>().HasComponent<FlashOnTriggerComponent>(args.Using.Uid))
                return false;

            _grenadesContainer.Insert(args.Using);