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

Don't consider power for docking (#9054)

Browse Source
This commit is contained in:
metalgearsloth
2022-06-23 17:22:10 +10:00
committed by GitHub
parent e5effc50a3
commit adc419c6fc
1 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Content.Server/Shuttles/Systems/DockingSystem.cs
View File

@@ -1,12 +1,9 @@
using Content.Server.Doors.Systems; using Content.Server.Doors.Systems;
using Content.Server.Power.Components;
using Content.Server.Shuttles.Components; using Content.Server.Shuttles.Components;
using Content.Server.Shuttles.Events; using Content.Server.Shuttles.Events;
using Content.Shared.Doors; using Content.Shared.Doors;
using Content.Shared.Doors.Components; using Content.Shared.Doors.Components;
using Content.Shared.Shuttles.Events; using Content.Shared.Shuttles.Events;
using Content.Shared.Verbs;
using Robust.Server.Player;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Physics; using Robust.Shared.Physics;
using Robust.Shared.Physics.Collision.Shapes; using Robust.Shared.Physics.Collision.Shapes;
@@ -35,7 +32,6 @@ namespace Content.Server.Shuttles.Systems
_sawmill = Logger.GetSawmill("docking"); _sawmill = Logger.GetSawmill("docking");
SubscribeLocalEvent<DockingComponent, ComponentStartup>(OnStartup); SubscribeLocalEvent<DockingComponent, ComponentStartup>(OnStartup);
SubscribeLocalEvent<DockingComponent, ComponentShutdown>(OnShutdown); SubscribeLocalEvent<DockingComponent, ComponentShutdown>(OnShutdown);
SubscribeLocalEvent<DockingComponent, PowerChangedEvent>(OnPowerChange);
SubscribeLocalEvent<DockingComponent, AnchorStateChangedEvent>(OnAnchorChange); SubscribeLocalEvent<DockingComponent, AnchorStateChangedEvent>(OnAnchorChange);
SubscribeLocalEvent<DockingComponent, ReAnchorEvent>(OnDockingReAnchor); SubscribeLocalEvent<DockingComponent, ReAnchorEvent>(OnDockingReAnchor);
@@ -73,7 +69,6 @@ namespace Content.Server.Shuttles.Systems
var transform = body.GetTransform(); var transform = body.GetTransform();
var dockingFixture = _fixtureSystem.GetFixtureOrNull(body, DockingFixture); var dockingFixture = _fixtureSystem.GetFixtureOrNull(body, DockingFixture);
// Happens if no power or whatever
if (dockingFixture == null) if (dockingFixture == null)
return null; return null;
@@ -229,22 +224,6 @@ namespace Content.Server.Shuttles.Systems
_console.RefreshShuttleConsoles(); _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 <Reasons> 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) private void DisableDocking(EntityUid uid, DockingComponent component)
{ {
if (!component.Enabled) return; if (!component.Enabled) return;