Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

nukes more resolves

Browse Source
This commit is contained in:
Paul
2021-12-08 19:39:03 +01:00
parent 4dcfebfd53
commit 0121f056df
8 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Body/Systems/MetabolizerSystem.cs
View File

@@ -165,7 +165,7 @@ namespace Content.Server.Body.Systems
{
var entity = args.SolutionEntity;
_logSystem.Add(LogType.ReagentEffect, effect.LogImpact,
$"Metabolism effect {effect.GetType().Name} of reagent {args.Reagent.Name:reagent} applied on entity {entity} at {IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).Coordinates}");
$"Metabolism effect {effect.GetType().Name} of reagent {args.Reagent.Name:reagent} applied on entity {entity} at {EntityManager.GetComponent<TransformComponent>(entity).Coordinates}");
}
effect.Effect(args);

2
Content.Server/CharacterAppearance/Systems/HumanoidAppearanceSystem.cs
View File

@@ -22,7 +22,7 @@ namespace Content.Server.CharacterAppearance.Systems
{
foreach (var (part, _) in body.Parts)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(part.Owner, out SpriteComponent? sprite))
if (EntityManager.TryGetComponent(part.Owner, out SpriteComponent? sprite))
{
sprite!.Color = component.Appearance.SkinColor;
}

2
Content.Server/Containers/EmptyOnMachineDeconstructSystem.cs
View File

@@ -35,7 +35,7 @@ namespace Content.Server.Containers
{
if (!EntityManager.TryGetComponent<IContainerManager>(uid, out var mComp))
return;
var baseCoords = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).Coordinates;
var baseCoords = EntityManager.GetComponent<TransformComponent>(component.Owner).Coordinates;
foreach (var v in component.Containers)
{
if (mComp.TryGetContainer(v, out var container))

2
Content.Server/Light/EntitySystems/MatchboxSystem.cs
View File

@@ -17,7 +17,7 @@ namespace Content.Server.Light.EntitySystems
private void OnInteractUsing(EntityUid uid, MatchboxComponent component, InteractUsingEvent args)
{
if (!args.Handled
&& IoCManager.Resolve<IEntityManager>().TryGetComponent<MatchstickComponent?>(args.Used, out var matchstick)
&& EntityManager.TryGetComponent<MatchstickComponent?>(args.Used, out var matchstick)
&& matchstick.CurrentState == SmokableState.Unlit)
{
Get<MatchstickSystem>().Ignite(matchstick, args.User);

2
Content.Server/Movement/StressTestMovementSystem.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Server.Movement
foreach (var stressTest in EntityManager.EntityQuery<StressTestMovementComponent>(true))
{
var transform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(stressTest.Owner);
var transform = EntityManager.GetComponent<TransformComponent>(stressTest.Owner);
stressTest.Progress += frameTime;