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

Replace IEntityManager resolves in systems for cached EntityManager

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-08 13:00:43 +01:00
parent 2699540526
commit c8b65be747
98 changed files with 338 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Chemistry/EntitySystems/RehydratableSystem.cs
View File

@@ -39,12 +39,12 @@ namespace Content.Server.Chemistry.EntitySystems
owner.PopupMessageEveryone(Loc.GetString("rehydratable-component-expands-message", ("owner", owner)));
if (!string.IsNullOrEmpty(component.TargetPrototype))
{
var ent = IoCManager.Resolve<IEntityManager>().SpawnEntity(component.TargetPrototype,
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(owner).Coordinates);
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(ent).AttachToGridOrMap();
var ent = EntityManager.SpawnEntity(component.TargetPrototype,
EntityManager.GetComponent<TransformComponent>(owner).Coordinates);
EntityManager.GetComponent<TransformComponent>(ent).AttachToGridOrMap();
}
IoCManager.Resolve<IEntityManager>().QueueDeleteEntity((EntityUid) owner);
EntityManager.QueueDeleteEntity((EntityUid) owner);
}
}
}

2
Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs
View File

@@ -292,7 +292,7 @@ namespace Content.Server.Chemistry.EntitySystems
{
var reagentQuantity = FixedPoint2.New(0);
if (EntityManager.EntityExists(owner)
&& IoCManager.Resolve<IEntityManager>().TryGetComponent(owner, out SolutionContainerManagerComponent? managerComponent))
&& EntityManager.TryGetComponent(owner, out SolutionContainerManagerComponent? managerComponent))
{
foreach (var solution in managerComponent.Solutions.Values)
{

2
Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs
View File

@@ -30,7 +30,7 @@ namespace Content.Server.Chemistry.EntitySystems
private void HandleInjection(EntityUid uid, SolutionInjectOnCollideComponent component, StartCollideEvent args)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<BloodstreamComponent?>(args.OtherFixture.Body.Owner, out var bloodstream) ||
if (!EntityManager.TryGetComponent<BloodstreamComponent?>(args.OtherFixture.Body.Owner, out var bloodstream) ||
!_solutionsSystem.TryGetInjectableSolution(component.Owner, out var solution)) return;
var solRemoved = solution.SplitSolution(component.TransferAmount);

2
Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs
View File

@@ -32,7 +32,7 @@ namespace Content.Server.Chemistry.EntitySystems
if (!args.CanAccess || !args.CanInteract || !component.CanChangeTransferAmount)
return;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<ActorComponent?>(args.User, out var actor))
if (!EntityManager.TryGetComponent<ActorComponent?>(args.User, out var actor))
return;
// Custom transfer verb

12
Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs
View File

@@ -50,14 +50,14 @@ namespace Content.Server.Chemistry.EntitySystems
var spriteSpec =
new SpriteSpecifier.Rsi(
new ResourcePath("Objects/Consumable/Drinks/" + proto.SpriteReplacementPath), "icon");
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(owner, out SpriteComponent? sprite))
if (EntityManager.TryGetComponent(owner, out SpriteComponent? sprite))
{
sprite?.LayerSetSprite(0, spriteSpec);
}
string val = proto.Name + " glass";
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(owner).EntityName = val;
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(owner).EntityDescription = proto.Description;
EntityManager.GetComponent<MetaDataComponent>(owner).EntityName = val;
EntityManager.GetComponent<MetaDataComponent>(owner).EntityDescription = proto.Description;
component.CurrentReagent = proto;
component.Transformed = true;
}
@@ -68,14 +68,14 @@ namespace Content.Server.Chemistry.EntitySystems
component.CurrentReagent = null;
component.Transformed = false;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out SpriteComponent? sprite) &&
if (EntityManager.TryGetComponent(component.Owner, out SpriteComponent? sprite) &&
component.InitialSprite != null)
{
sprite.LayerSetSprite(0, component.InitialSprite);
}
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(component.Owner).EntityName = component.InitialName;
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(component.Owner).EntityDescription = component.InitialDescription;
EntityManager.GetComponent<MetaDataComponent>(component.Owner).EntityName = component.InitialName;
EntityManager.GetComponent<MetaDataComponent>(component.Owner).EntityDescription = component.InitialDescription;
}
}
}

12
Content.Server/Chemistry/EntitySystems/VaporSystem.cs
View File

@@ -52,7 +52,7 @@ namespace Content.Server.Chemistry.EntitySystems
vapor.Target = target;
vapor.AliveTime = aliveTime;
// Set Move
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(vapor.Owner, out PhysicsComponent? physics))
if (EntityManager.TryGetComponent(vapor.Owner, out PhysicsComponent? physics))
{
physics.BodyStatus = BodyStatus.InAir;
physics.ApplyLinearImpulse(dir * speed);
@@ -97,12 +97,12 @@ namespace Content.Server.Chemistry.EntitySystems
vapor.Timer += frameTime;
vapor.ReactTimer += frameTime;
if (vapor.ReactTimer >= ReactTime && IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(vapor.Owner).GridID.IsValid())
if (vapor.ReactTimer >= ReactTime && EntityManager.GetComponent<TransformComponent>(vapor.Owner).GridID.IsValid())
{
vapor.ReactTimer = 0;
var mapGrid = _mapManager.GetGrid(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).GridID);
var mapGrid = _mapManager.GetGrid(EntityManager.GetComponent<TransformComponent>(entity).GridID);
var tile = mapGrid.GetTileRef(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).Coordinates.ToVector2i(EntityManager, _mapManager));
var tile = mapGrid.GetTileRef(EntityManager.GetComponent<TransformComponent>(entity).Coordinates.ToVector2i(EntityManager, _mapManager));
foreach (var reagentQuantity in contents.Contents.ToArray())
{
if (reagentQuantity.Quantity == FixedPoint2.Zero) continue;
@@ -114,7 +114,7 @@ namespace Content.Server.Chemistry.EntitySystems
// Check if we've reached our target.
if (!vapor.Reached &&
vapor.Target.TryDistance(EntityManager, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).Coordinates, out var distance) &&
vapor.Target.TryDistance(EntityManager, EntityManager.GetComponent<TransformComponent>(entity).Coordinates, out var distance) &&
distance <= 0.5f)
{
vapor.Reached = true;
@@ -123,7 +123,7 @@ namespace Content.Server.Chemistry.EntitySystems
if (contents.CurrentVolume == 0 || vapor.Timer > vapor.AliveTime)
{
// Delete this
IoCManager.Resolve<IEntityManager>().QueueDeleteEntity(entity);
EntityManager.QueueDeleteEntity(entity);
}
}
}