From adc419c6fcc5a05a7840810e7fd99b0677adc8ff Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Thu, 23 Jun 2022 17:22:10 +1000 Subject: [PATCH] Don't consider power for docking (#9054) --- .../Shuttles/Systems/DockingSystem.cs | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/Content.Server/Shuttles/Systems/DockingSystem.cs b/Content.Server/Shuttles/Systems/DockingSystem.cs index d1d738bfc4..bbadd99fd2 100644 --- a/Content.Server/Shuttles/Systems/DockingSystem.cs +++ b/Content.Server/Shuttles/Systems/DockingSystem.cs @@ -1,12 +1,9 @@ using Content.Server.Doors.Systems; -using Content.Server.Power.Components; using Content.Server.Shuttles.Components; using Content.Server.Shuttles.Events; using Content.Shared.Doors; using Content.Shared.Doors.Components; using Content.Shared.Shuttles.Events; -using Content.Shared.Verbs; -using Robust.Server.Player; using Robust.Shared.Map; using Robust.Shared.Physics; using Robust.Shared.Physics.Collision.Shapes; @@ -35,7 +32,6 @@ namespace Content.Server.Shuttles.Systems _sawmill = Logger.GetSawmill("docking"); SubscribeLocalEvent(OnStartup); SubscribeLocalEvent(OnShutdown); - SubscribeLocalEvent(OnPowerChange); SubscribeLocalEvent(OnAnchorChange); SubscribeLocalEvent(OnDockingReAnchor); @@ -73,7 +69,6 @@ namespace Content.Server.Shuttles.Systems var transform = body.GetTransform(); var dockingFixture = _fixtureSystem.GetFixtureOrNull(body, DockingFixture); - // Happens if no power or whatever if (dockingFixture == null) return null; @@ -229,22 +224,6 @@ namespace Content.Server.Shuttles.Systems _console.RefreshShuttleConsoles(); } - private void OnPowerChange(EntityUid uid, DockingComponent component, PowerChangedEvent args) - { - var lifestage = MetaData(uid).EntityLifeStage; - // This is because power can change during startup for and undock - if (lifestage is < EntityLifeStage.MapInitialized or >= EntityLifeStage.Terminating) return; - - if (args.Powered) - { - EnableDocking(uid, component); - } - else - { - DisableDocking(uid, component); - } - } - private void DisableDocking(EntityUid uid, DockingComponent component) { if (!component.Enabled) return;