From ff61bc12a4227de76f33f4493a2cb28cc5bb65f4 Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Sun, 4 Sep 2022 19:26:20 +1200 Subject: [PATCH] Fix docking adding comps to terminating entities (#11010) --- Content.Server/Shuttles/Systems/DockingSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Shuttles/Systems/DockingSystem.cs b/Content.Server/Shuttles/Systems/DockingSystem.cs index a65fd3dc2a..eed5a47b87 100644 --- a/Content.Server/Shuttles/Systems/DockingSystem.cs +++ b/Content.Server/Shuttles/Systems/DockingSystem.cs @@ -461,13 +461,13 @@ namespace Content.Server.Shuttles.Systems _doorSystem.TryClose(doorB.Owner, doorB); } - if (!Deleted(dock.Owner)) + if (LifeStage(dock.Owner) < EntityLifeStage.Terminating) { var recentlyDocked = EnsureComp(dock.Owner); recentlyDocked.LastDocked = dock.DockedWith.Value; } - if (!Deleted(dock.DockedWith.Value)) + if (TryComp(dock.DockedWith.Value, out MetaDataComponent? meta) && meta.EntityLifeStage < EntityLifeStage.Terminating) { var recentlyDocked = EnsureComp(dock.DockedWith.Value); recentlyDocked.LastDocked = dock.DockedWith.Value;