Fix taser visuals not updating after charging. (#6065)

This commit is contained in:
Leon Friedrich
2022-01-10 01:48:58 +13:00
committed by GitHub
parent 259914b919
commit 5a64936ade
4 changed files with 21 additions and 6 deletions

View File

@@ -99,7 +99,12 @@ namespace Content.Server.Stunnable
private void OnPowerCellChanged(EntityUid uid, StunbatonComponent comp, PowerCellChangedEvent args)
{
if (args.Ejected)
if (!comp.Activated)
return;
if (args.Ejected
|| !_cellSystem.TryGetBatteryFromSlot(comp.Owner, out var battery)
|| battery.CurrentCharge < comp.EnergyPerUse)
{
TurnOff(comp);
}
@@ -175,9 +180,6 @@ namespace Content.Server.Stunnable
return;
var playerFilter = Filter.Pvs(comp.Owner);
if (!EntityManager.TryGetComponent<PowerCellSlotComponent?>(comp.Owner, out var slot))
return;
if (!_cellSystem.TryGetBatteryFromSlot(comp.Owner, out var battery))
{
SoundSystem.Play(playerFilter, comp.TurnOnFailSound.GetSound(), comp.Owner, AudioHelpers.WithVariation(0.25f));