Inline TryGetComponent completely, for real

2021-12-03 14:17:01 +01:00
parent 2ff4ec65d5
commit 69b270017b
425 changed files with 1143 additions and 995 deletions
--- a/Content.Server/Fluids/Components/BucketComponent.cs
+++ b/Content.Server/Fluids/Components/BucketComponent.cs
@@ -56,7 +56,7 @@ namespace Content.Server.Fluids.Components
            var solutionsSys = EntitySystem.Get<SolutionContainerSystem>();
            if (!solutionsSys.TryGetSolution(Owner.Uid, SolutionName, out var contents) ||
                _currentlyUsing.Contains(eventArgs.Using.Uid) ||
-                !eventArgs.Using.TryGetComponent(out MopComponent? mopComponent) ||
+                !IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.Using.Uid, out MopComponent? mopComponent) ||
                mopComponent.Mopping)
            {
                return false;