]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Remove usages of obsolete methods in ChargeBatteryArtifactSystem (#21664)
authorDrSmugleaf <DrSmugleaf@users.noreply.github.com>
Thu, 16 Nov 2023 08:14:02 +0000 (00:14 -0800)
committerGitHub <noreply@github.com>
Thu, 16 Nov 2023 08:14:02 +0000 (01:14 -0700)
* Remove usages of obsolete methods in ChargeBatteryArtifactSystem

* Fix _maxCharge

Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ChargeBatteryArtifactSystem.cs

index 3569a30c360679f9f347e9aaa3ea4a92272c9692..778c672729a4bd08b416acb9dcddedf5188473e0 100644 (file)
@@ -1,6 +1,8 @@
 using Content.Server.Power.Components;
+using Content.Server.Power.EntitySystems;
 using Content.Server.Xenoarchaeology.XenoArtifacts.Effects.Components;
 using Content.Server.Xenoarchaeology.XenoArtifacts.Events;
+using Robust.Server.GameObjects;
 
 namespace Content.Server.Xenoarchaeology.XenoArtifacts.Effects.Systems;
 
@@ -9,7 +11,10 @@ namespace Content.Server.Xenoarchaeology.XenoArtifacts.Effects.Systems;
 /// </summary>
 public sealed class ChargeBatteryArtifactSystem : EntitySystem
 {
+    [Dependency] private readonly BatterySystem _battery = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
+
     /// <inheritdoc/>
     public override void Initialize()
     {
@@ -18,9 +23,9 @@ public sealed class ChargeBatteryArtifactSystem : EntitySystem
 
     private void OnActivated(EntityUid uid, ChargeBatteryArtifactComponent component, ArtifactActivatedEvent args)
     {
-        foreach (var battery in _lookup.GetComponentsInRange<BatteryComponent>(Transform(uid).MapPosition, component.Radius))
+        foreach (var battery in _lookup.GetEntitiesInRange<BatteryComponent>(_transform.GetMapCoordinates(uid), component.Radius))
         {
-            battery.CurrentCharge = battery.MaxCharge;
+            _battery.SetCharge(battery, battery.Comp.MaxCharge, battery);
         }
     }
 }