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

Stop BatterySystem from iterating over every battery just to recharge micro-reactors (#5393)

Browse Source
This commit is contained in:
20kdc
2021-11-18 19:02:17 +00:00
committed by GitHub
parent f8b6cfca6c
commit 856e570c7b
5 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Power/EntitySystems/BatterySystem.cs
View File

@@ -17,7 +17,7 @@ namespace Content.Server.Power.EntitySystems
private void PreSync(NetworkBatteryPreSync ev)
{
foreach (var (bat, netBat) in EntityManager.EntityQuery<BatteryComponent, PowerNetworkBatteryComponent>())
foreach (var (netBat, bat) in EntityManager.EntityQuery<PowerNetworkBatteryComponent, BatteryComponent>())
{
netBat.NetworkBattery.Capacity = bat.MaxCharge;
netBat.NetworkBattery.CurrentStorage = bat.CurrentCharge;
@@ -26,7 +26,7 @@ namespace Content.Server.Power.EntitySystems
private void PostSync(NetworkBatteryPostSync ev)
{
foreach (var (bat, netBat) in EntityManager.EntityQuery<BatteryComponent, PowerNetworkBatteryComponent>())
foreach (var (netBat, bat) in EntityManager.EntityQuery<PowerNetworkBatteryComponent, BatteryComponent>())
{
bat.CurrentCharge = netBat.NetworkBattery.CurrentStorage;
}
@@ -34,9 +34,11 @@ namespace Content.Server.Power.EntitySystems
public override void Update(float frameTime)
{
foreach (var comp in EntityManager.EntityQuery<BatteryComponent>())
foreach (var (comp, batt) in EntityManager.EntityQuery<BatterySelfRechargerComponent, BatteryComponent>())
{
comp.OnUpdate(frameTime);
if (!comp.AutoRecharge) continue;
if (batt.IsFullyCharged) continue;
batt.CurrentCharge += comp.AutoRechargeRate * frameTime;
}
}
}