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

4
Content.Server/Power/EntitySystems/BaseChargerSystem.cs
View File

@@ -43,7 +43,7 @@ namespace Content.Server.Power.EntitySystems
return;
Verb verb = new();
verb.Text = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(component.Container.ContainedEntity!.Value).EntityName;
verb.Text = EntityManager.GetComponent<MetaDataComponent>(component.Container.ContainedEntity!.Value).EntityName;
verb.Category = VerbCategory.Eject;
verb.Act = () => component.RemoveItem(args.User);
args.Verbs.Add(verb);
@@ -60,7 +60,7 @@ namespace Content.Server.Power.EntitySystems
return;
Verb verb = new();
verb.Text = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(@using).EntityName;
verb.Text = EntityManager.GetComponent<MetaDataComponent>(@using).EntityName;
verb.Category = VerbCategory.Insert;
verb.Act = () => component.TryInsertItem(@using);
args.Verbs.Add(verb);

2
Content.Server/Power/EntitySystems/CableMultitoolSystem.cs
View File

@@ -43,7 +43,7 @@ namespace Content.Server.Power.EntitySystems
if (args.IsInDetailsRange)
{
// Determine if they are holding a multitool.
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<HandsComponent?>(args.Examiner, out var hands) && hands.TryGetActiveHand(out var hand))
if (EntityManager.TryGetComponent<HandsComponent?>(args.Examiner, out var hands) && hands.TryGetActiveHand(out var hand))
{
var held = hand.HeldEntity;
// Pulsing is hardcoded here because I don't think it needs to be more complex than that right now.

2
Content.Server/Power/EntitySystems/CableVisSystem.cs
View File

@@ -63,7 +63,7 @@ namespace Content.Server.Power.EntitySystems
if (reachable is not CableNode)
continue;
var otherTransform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(reachable.Owner);
var otherTransform = EntityManager.GetComponent<TransformComponent>(reachable.Owner);
if (otherTransform.GridID != grid.Index)
continue;

8
Content.Server/Power/EntitySystems/ExtensionCableSystem.cs
View File

@@ -85,7 +85,7 @@ namespace Content.Server.Power.EntitySystems
if (EntityManager.TryGetComponent<ExtensionCableReceiverComponent>(entity, out var receiver) &&
receiver.Connectable &&
receiver.Provider == null &&
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).Coordinates.TryDistance(IoCManager.Resolve<IEntityManager>(), IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(owner).Coordinates, out var distance) &&
EntityManager.GetComponent<TransformComponent>(entity).Coordinates.TryDistance(EntityManager, EntityManager.GetComponent<TransformComponent>(owner).Coordinates, out var distance) &&
distance < Math.Min(range, receiver.ReceptionRange))
{
yield return receiver;
@@ -118,7 +118,7 @@ namespace Content.Server.Power.EntitySystems
private void OnReceiverStarted(EntityUid uid, ExtensionCableReceiverComponent receiver, ComponentStartup args)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(receiver.Owner, out PhysicsComponent? physicsComponent))
if (EntityManager.TryGetComponent(receiver.Owner, out PhysicsComponent? physicsComponent))
{
receiver.Connectable = physicsComponent.BodyType == BodyType.Static;
}
@@ -179,11 +179,11 @@ namespace Content.Server.Power.EntitySystems
foreach (var entity in nearbyEntities)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<ExtensionCableProviderComponent?>(entity, out var provider)) continue;
if (!EntityManager.TryGetComponent<ExtensionCableProviderComponent?>(entity, out var provider)) continue;
if (!provider.Connectable) continue;
if (!IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).Coordinates.TryDistance(IoCManager.Resolve<IEntityManager>(), IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(owner).Coordinates, out var distance)) continue;
if (!EntityManager.GetComponent<TransformComponent>(entity).Coordinates.TryDistance(EntityManager, EntityManager.GetComponent<TransformComponent>(owner).Coordinates, out var distance)) continue;
if (!(distance < Math.Min(range, provider.TransferRange))) continue;

6
Content.Server/Power/EntitySystems/PowerNetSystem.cs
View File

@@ -343,7 +343,7 @@ namespace Content.Server.Power.EntitySystems
foreach (var apc in net.Apcs)
{
var netBattery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(apc.Owner);
var netBattery = EntityManager.GetComponent<PowerNetworkBatteryComponent>(apc.Owner);
netNode.BatteriesDischarging.Add(netBattery.NetworkBattery.Id);
netBattery.NetworkBattery.LinkedNetworkDischarging = netNode.Id;
}
@@ -372,14 +372,14 @@ namespace Content.Server.Power.EntitySystems
foreach (var charger in net.Chargers)
{
var battery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(charger.Owner);
var battery = EntityManager.GetComponent<PowerNetworkBatteryComponent>(charger.Owner);
netNode.BatteriesCharging.Add(battery.NetworkBattery.Id);
battery.NetworkBattery.LinkedNetworkCharging = netNode.Id;
}
foreach (var discharger in net.Dischargers)
{
var battery = IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(discharger.Owner);
var battery = EntityManager.GetComponent<PowerNetworkBatteryComponent>(discharger.Owner);
netNode.BatteriesDischarging.Add(battery.NetworkBattery.Id);
battery.NetworkBattery.LinkedNetworkDischarging = netNode.Id;
}