From 4dcfebfd53139c0ba28b03c4437c05d4249b1166 Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Wed, 8 Dec 2021 17:44:39 +0100 Subject: [PATCH] Fix build --- .../Chemistry/Components/HyposprayComponent.cs | 10 +++++----- .../Clothing/Components/MagbootsComponent.cs | 2 +- .../Body/Components/SharedBodyPartComponent.cs | 2 +- Content.Shared/Movement/SharedMoverController.cs | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Content.Server/Chemistry/Components/HyposprayComponent.cs b/Content.Server/Chemistry/Components/HyposprayComponent.cs index 2df52ebdd1..8512a34109 100644 --- a/Content.Server/Chemistry/Components/HyposprayComponent.cs +++ b/Content.Server/Chemistry/Components/HyposprayComponent.cs @@ -45,7 +45,7 @@ namespace Content.Server.Chemistry.Components public bool TryDoInject(EntityUid? target, EntityUid user) { - if (!EligibleEntity(target)) + if (!EligibleEntity(target, _entMan)) return false; string? msgFormat = null; @@ -54,7 +54,7 @@ namespace Content.Server.Chemistry.Components { msgFormat = "hypospray-component-inject-self-message"; } - else if (EligibleEntity(user) && ClumsyComponent.TryRollClumsy(user, ClumsyFailChance)) + else if (EligibleEntity(user, _entMan) && ClumsyComponent.TryRollClumsy(user, ClumsyFailChance)) { msgFormat = "hypospray-component-inject-self-clumsy-message"; target = user; @@ -113,13 +113,13 @@ namespace Content.Server.Chemistry.Components EntitySystem.Get().TryAddSolution(target.Value, targetSolution, removedSolution); - static bool EligibleEntity([NotNullWhen(true)] EntityUid? entity) + static bool EligibleEntity([NotNullWhen(true)] EntityUid? entity, IEntityManager entMan) { // TODO: Does checking for BodyComponent make sense as a "can be hypospray'd" tag? // In SS13 the hypospray ONLY works on mobs, NOT beakers or anything else. - return _entMan.HasComponent(entity) - && _entMan.HasComponent(entity); + return entMan.HasComponent(entity) + && entMan.HasComponent(entity); } return true; diff --git a/Content.Server/Clothing/Components/MagbootsComponent.cs b/Content.Server/Clothing/Components/MagbootsComponent.cs index abec1a0286..a0e19db7cc 100644 --- a/Content.Server/Clothing/Components/MagbootsComponent.cs +++ b/Content.Server/Clothing/Components/MagbootsComponent.cs @@ -126,7 +126,7 @@ namespace Content.Server.Clothing.Components { public bool DoToggleAction(ToggleItemActionEventArgs args) { - if (!_entMan.TryGetComponent(args.Item, out var magboots)) + if (!IoCManager.Resolve().TryGetComponent(args.Item, out var magboots)) return false; magboots.Toggle(args.Performer); diff --git a/Content.Shared/Body/Components/SharedBodyPartComponent.cs b/Content.Shared/Body/Components/SharedBodyPartComponent.cs index 03ccea1019..076001d7f3 100644 --- a/Content.Shared/Body/Components/SharedBodyPartComponent.cs +++ b/Content.Shared/Body/Components/SharedBodyPartComponent.cs @@ -360,7 +360,7 @@ namespace Content.Shared.Body.Components return _mechanisms; } - entityManager ??= _entMan; + IoCManager.Resolve(ref entityManager); var mechanisms = new List(MechanismIds.Length); diff --git a/Content.Shared/Movement/SharedMoverController.cs b/Content.Shared/Movement/SharedMoverController.cs index 2bd560c096..363f8a19d0 100644 --- a/Content.Shared/Movement/SharedMoverController.cs +++ b/Content.Shared/Movement/SharedMoverController.cs @@ -186,7 +186,7 @@ namespace Content.Shared.Movement !otherCollider.CanCollide || ((collider.CollisionMask & otherCollider.CollisionLayer) == 0 && (otherCollider.CollisionMask & collider.CollisionLayer) == 0) || - (EntityManager.TryGetComponent(otherCollider.Owner, out SharedPullableComponent? pullable) && pullable.BeingPulled)) + (IoCManager.Resolve().TryGetComponent(otherCollider.Owner, out SharedPullableComponent? pullable) && pullable.BeingPulled)) { continue; }