tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-08 17:44:39 +01:00
parent cdc8336695
commit 4dcfebfd53
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Chemistry/Components/HyposprayComponent.cs
View File

@@ -45,7 +45,7 @@ namespace Content.Server.Chemistry.Components
public bool TryDoInject(EntityUid? target, EntityUid user) public bool TryDoInject(EntityUid? target, EntityUid user)
{ {
if (!EligibleEntity(target)) if (!EligibleEntity(target, _entMan))
return false; return false;
string? msgFormat = null; string? msgFormat = null;
@@ -54,7 +54,7 @@ namespace Content.Server.Chemistry.Components
{ {
msgFormat = "hypospray-component-inject-self-message"; 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"; msgFormat = "hypospray-component-inject-self-clumsy-message";
target = user; target = user;
@@ -113,13 +113,13 @@ namespace Content.Server.Chemistry.Components
EntitySystem.Get<SolutionContainerSystem>().TryAddSolution(target.Value, targetSolution, removedSolution); EntitySystem.Get<SolutionContainerSystem>().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? // 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. // In SS13 the hypospray ONLY works on mobs, NOT beakers or anything else.
return _entMan.HasComponent<SolutionContainerManagerComponent>(entity) return entMan.HasComponent<SolutionContainerManagerComponent>(entity)
&& _entMan.HasComponent<MobStateComponent>(entity); && entMan.HasComponent<MobStateComponent>(entity);
} }
return true; return true;

2
Content.Server/Clothing/Components/MagbootsComponent.cs
View File

@@ -126,7 +126,7 @@ namespace Content.Server.Clothing.Components
{ {
public bool DoToggleAction(ToggleItemActionEventArgs args) public bool DoToggleAction(ToggleItemActionEventArgs args)
{ {
if (!_entMan.TryGetComponent<MagbootsComponent?>(args.Item, out var magboots)) if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<MagbootsComponent?>(args.Item, out var magboots))
return false; return false;
magboots.Toggle(args.Performer); magboots.Toggle(args.Performer);

2
Content.Shared/Body/Components/SharedBodyPartComponent.cs
View File

@@ -360,7 +360,7 @@ namespace Content.Shared.Body.Components
return _mechanisms; return _mechanisms;
} }
entityManager ??= _entMan; IoCManager.Resolve(ref entityManager);
var mechanisms = new List<SharedMechanismComponent>(MechanismIds.Length); var mechanisms = new List<SharedMechanismComponent>(MechanismIds.Length);

2
Content.Shared/Movement/SharedMoverController.cs
View File

@@ -186,7 +186,7 @@ namespace Content.Shared.Movement
!otherCollider.CanCollide || !otherCollider.CanCollide ||
((collider.CollisionMask & otherCollider.CollisionLayer) == 0 && ((collider.CollisionMask & otherCollider.CollisionLayer) == 0 &&
(otherCollider.CollisionMask & collider.CollisionLayer) == 0) || (otherCollider.CollisionMask & collider.CollisionLayer) == 0) ||
(EntityManager.TryGetComponent(otherCollider.Owner, out SharedPullableComponent? pullable) && pullable.BeingPulled)) (IoCManager.Resolve<IEntityManager>().TryGetComponent(otherCollider.Owner, out SharedPullableComponent? pullable) && pullable.BeingPulled))
{ {
continue; continue;
} }