Skip to content

Commit

Permalink
Mirror: Fix borg charger error (#252)
Browse files Browse the repository at this point in the history
## Mirror of PR #26230: [Fix borg charger
error](space-wizards/space-station-14#26230)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `29887636e5614f4f91b968107875722293f0c8b4`

PR opened by <img
src="https://avatars.githubusercontent.com/u/85356?v=4" width="16"/><a
href="https://github.com/Tayrtahn"> Tayrtahn</a> at 2024-03-18 12:52:09
UTC

---

PR changed 1 files with 7 additions and 7 deletions.

The PR had the following labels:


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> ## About the PR
> <!-- What did you change in this PR? -->
> Borg chargers can now charge borgs again.
> 
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> Bug fix.
> 
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
> An oversight in #25871 caused ChargerSystem to call BatterySystem's
SetCharge with the wrong EntityUid.
> 
> SearchForBattery has been given another out argument which gives the
found battery's uid so it can be passed to SetCharge.
> 
> To the author of #25871: get better at testing your code!
> 
> ## Media
> <!-- 
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
> 
> If you're unsure whether your PR will require media, ask a maintainer.
> 
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
> 
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> 
> ## Breaking changes
> <!--
> List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
> -->
> 
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
> 
> <!--
> Make sure to take this Changelog template out of the comment block in
order for it to show up.
> 🆑
> - add: Added fun!
> - remove: Removed fun!
> - tweak: Changed fun!
> - fix: Fixed fun!
> -->
> 🆑
> - fix: Cyborg recharging stations are able to charge cyborgs again.


</details>

Co-authored-by: SimpleStation14 <Unknown>
  • Loading branch information
SimpleStation14 authored May 12, 2024
1 parent 4b53cdf commit 89d5d17
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions Content.Server/Power/EntitySystems/ChargerSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using JetBrains.Annotations;
using Robust.Shared.Containers;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Shared.Storage.Components;
using Robust.Server.Containers;

Expand Down Expand Up @@ -179,7 +178,7 @@ private CellChargerStatus GetStatus(EntityUid uid, ChargerComponent component)
if (container.ContainedEntities.Count == 0)
return CellChargerStatus.Empty;

if (!SearchForBattery(container.ContainedEntities.First(), out var heldBattery))
if (!SearchForBattery(container.ContainedEntities[0], out _, out var heldBattery))
return CellChargerStatus.Off;

if (Math.Abs(heldBattery.MaxCharge - heldBattery.CurrentCharge) < 0.01)
Expand All @@ -199,27 +198,28 @@ private void TransferPower(EntityUid uid, EntityUid targetEntity, ChargerCompone
if (component.Whitelist?.IsValid(targetEntity, EntityManager) == false)
return;

if (!SearchForBattery(targetEntity, out var heldBattery))
if (!SearchForBattery(targetEntity, out var batteryUid, out var heldBattery))
return;

_battery.SetCharge(targetEntity, heldBattery.CurrentCharge + component.ChargeRate * frameTime, heldBattery);
_battery.SetCharge(batteryUid.Value, heldBattery.CurrentCharge + component.ChargeRate * frameTime, heldBattery);
// Just so the sprite won't be set to 99.99999% visibility
if (heldBattery.MaxCharge - heldBattery.CurrentCharge < 0.01)
{
_battery.SetCharge(targetEntity, heldBattery.MaxCharge, heldBattery);
_battery.SetCharge(batteryUid.Value, heldBattery.MaxCharge, heldBattery);
}

UpdateStatus(uid, component);
}

private bool SearchForBattery(EntityUid uid, [NotNullWhen(true)] out BatteryComponent? component)
private bool SearchForBattery(EntityUid uid, [NotNullWhen(true)] out EntityUid? batteryUid, [NotNullWhen(true)] out BatteryComponent? component)
{
// try get a battery directly on the inserted entity
if (!TryComp(uid, out component))
{
// or by checking for a power cell slot on the inserted entity
return _powerCell.TryGetBatteryFromSlot(uid, out component);
return _powerCell.TryGetBatteryFromSlot(uid, out batteryUid, out component);
}
batteryUid = uid;
return true;
}
}

0 comments on commit 89d5d17

Please sign in to comment.