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

Remove all obsolete BatteryComponent method calls (#25871)

Browse Source 
Removed all obsolete, non-ECS method calls to BatteryComponent
This commit is contained in:
Tayrtahn
2024-03-06 00:34:50 -05:00
committed by GitHub
parent 4228305b12
commit 2935e5bd78
12 changed files with 44 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,7 +151,7 @@ public sealed class EmergencyLightSystem : SharedEmergencyLightSystem
}
else
{
battery.CurrentCharge += component.ChargingWattage * frameTime * component.ChargingEfficiency;
_battery.SetCharge(uid, battery.CurrentCharge + component.ChargingWattage * frameTime * component.ChargingEfficiency, battery);
if (battery.IsFullyCharged)
{
if (TryComp<ApcPowerReceiverComponent>(uid, out var receiver))

4
Content.Server/Light/EntitySystems/HandheldLightSystem.cs
View File

@@ -1,5 +1,6 @@
using Content.Server.Actions;
using Content.Server.Popups;
using Content.Server.Power.EntitySystems;
using Content.Server.PowerCell;
using Content.Shared.Actions;
using Content.Shared.Examine;
@@ -25,6 +26,7 @@ namespace Content.Server.Light.EntitySystems
[Dependency] private readonly ActionContainerSystem _actionContainer = default!;
[Dependency] private readonly PopupSystem _popup = default!;
[Dependency] private readonly PowerCellSystem _powerCell = default!;
[Dependency] private readonly BatterySystem _battery = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedPointLightSystem _lights = default!;
@@ -268,7 +270,7 @@ namespace Content.Server.Light.EntitySystems
_appearance.SetData(uid, HandheldLightVisuals.Power, HandheldLightPowerStates.Dying, appearanceComponent);
}
if (component.Activated && !battery.TryUseCharge(component.Wattage * frameTime))
if (component.Activated && !_battery.TryUseCharge(uid, component.Wattage * frameTime, battery))
TurnOff(uid, false);
UpdateLevel(uid);