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

Fix electrocution resolve error log (#21179)

Browse Source
This commit is contained in:
Leon Friedrich
2023-10-24 17:22:05 +11:00
committed by GitHub
parent 29889f5ba7
commit 4e7bdc6658
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/Electrocution/ElectrocutionSystem.cs
View File

@@ -192,18 +192,13 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem
private void OnLightAttacked(EntityUid uid, PoweredLightComponent component, AttackedEvent args) private void OnLightAttacked(EntityUid uid, PoweredLightComponent component, AttackedEvent args)
{ {
if (!component.CurrentLit || args.Used != args.User)
return;
if (!_meleeWeapon.GetDamage(args.Used, args.User).Any()) if (!_meleeWeapon.GetDamage(args.Used, args.User).Any())
return; return;
if (args.Used != args.User)
return;
if (component.CurrentLit == false)
return;
DoCommonElectrocution(args.User, uid, component.UnarmedHitShock, component.UnarmedHitStun, false, 1); DoCommonElectrocution(args.User, uid, component.UnarmedHitShock, component.UnarmedHitStun, false, 1);
} }
private void OnElectrifiedInteractUsing(EntityUid uid, ElectrifiedComponent electrified, InteractUsingEvent args) private void OnElectrifiedInteractUsing(EntityUid uid, ElectrifiedComponent electrified, InteractUsingEvent args)
@@ -498,7 +493,7 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem
private void PlayElectrocutionSound(EntityUid targetUid, EntityUid sourceUid, ElectrifiedComponent? electrified = null) private void PlayElectrocutionSound(EntityUid targetUid, EntityUid sourceUid, ElectrifiedComponent? electrified = null)
{ {
if (!Resolve(sourceUid, ref electrified) || !electrified.PlaySoundOnShock) if (!Resolve(sourceUid, ref electrified, false) || !electrified.PlaySoundOnShock)
{ {
return; return;
} }