diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs index e9f6d00822..9365b22ad9 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs @@ -67,11 +67,6 @@ public sealed partial class CargoSystem private void OnPalletUIOpen(EntityUid uid, CargoPalletConsoleComponent component, BoundUIOpenedEvent args) { - var player = args.Actor; - - if (player == null) - return; - UpdatePalletConsoleInterface(uid); } @@ -85,11 +80,6 @@ public sealed partial class CargoSystem private void OnPalletAppraise(EntityUid uid, CargoPalletConsoleComponent component, CargoPalletAppraiseMessage args) { - var player = args.Actor; - - if (player == null) - return; - UpdatePalletConsoleInterface(uid); } @@ -313,11 +303,6 @@ public sealed partial class CargoSystem private void OnPalletSale(EntityUid uid, CargoPalletConsoleComponent component, CargoPalletSellMessage args) { - var player = args.Actor; - - if (player == null) - return; - var xform = Transform(uid); if (xform.GridUid is not EntityUid gridUid) diff --git a/Content.Server/Wires/WiresSystem.cs b/Content.Server/Wires/WiresSystem.cs index 92a0322ecb..3e75659072 100644 --- a/Content.Server/Wires/WiresSystem.cs +++ b/Content.Server/Wires/WiresSystem.cs @@ -387,11 +387,7 @@ public sealed class WiresSystem : SharedWiresSystem private void OnWiresActionMessage(EntityUid uid, WiresComponent component, WiresActionMessage args) { - if (args.Actor == null) - { - return; - } - var player = (EntityUid) args.Actor; + var player = args.Actor; if (!EntityManager.TryGetComponent(player, out HandsComponent? handsComponent)) {