From b354fcac21efe6ecc1c3569fcc5f93d85005086f Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sat, 4 Jun 2022 16:52:46 +1000 Subject: [PATCH] Fix docking fixture crash (#8640) --- Content.Server/Shuttles/EntitySystems/DockingSystem.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Server/Shuttles/EntitySystems/DockingSystem.cs b/Content.Server/Shuttles/EntitySystems/DockingSystem.cs index c78efbb3a4..6fcfdaae4d 100644 --- a/Content.Server/Shuttles/EntitySystems/DockingSystem.cs +++ b/Content.Server/Shuttles/EntitySystems/DockingSystem.cs @@ -261,8 +261,9 @@ namespace Content.Server.Shuttles.EntitySystems 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 (MetaData(uid).EntityLifeStage < EntityLifeStage.MapInitialized) return; + if (lifestage is < EntityLifeStage.MapInitialized or >= EntityLifeStage.Terminating) return; if (args.Powered) {