Fixtures (again) (#5636)

2021-12-01 18:32:37 +11:00
parent 134f71c0ee
commit 1c089a4079
109 changed files with 1024 additions and 829 deletions
--- a/Content.Server/Shuttles/EntitySystems/ShuttleSystem.cs
+++ b/Content.Server/Shuttles/EntitySystems/ShuttleSystem.cs
@@ -101,6 +101,9 @@ namespace Content.Server.Shuttles.EntitySystems

        private void OnShuttleShutdown(EntityUid uid, ShuttleComponent component, ComponentShutdown args)
        {
+            // None of the below is necessary for any cleanup if we're just deleting.
+            if (EntityManager.GetComponent<MetaDataComponent>(uid).EntityLifeStage >= EntityLifeStage.Terminating) return;
+
            if (!component.Owner.TryGetComponent(out PhysicsComponent? physicsComponent))
            {
                return;