From e468017152a6694aa5625447227bc3dec4c7fce9 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Tue, 16 May 2023 22:55:49 +1000
Subject: [PATCH] Fix salvage deletion (#16502)

---
 Content.Server/Salvage/SalvageSystem.Expeditions.cs | 10 ----------
 Content.Server/Salvage/SalvageSystem.Runner.cs      |  8 +++++---
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/Content.Server/Salvage/SalvageSystem.Expeditions.cs b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
index e5bbce38ea..31a1c5fd63 100644
--- a/Content.Server/Salvage/SalvageSystem.Expeditions.cs
+++ b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
@@ -146,16 +146,6 @@ public sealed partial class SalvageSystem
             GenerateMissions(comp);
             UpdateConsoles(comp);
         }
-
-        var query = EntityQueryEnumerator<SalvageExpeditionComponent>();
-
-        while (query.MoveNext(out var uid, out var comp))
-        {
-            if (comp.EndTime < currentTime)
-            {
-                QueueDel(uid);
-            }
-        }
     }
 
     private void FinishExpedition(SalvageExpeditionDataComponent component, SalvageExpeditionComponent expedition, EntityUid? shuttle)
diff --git a/Content.Server/Salvage/SalvageSystem.Runner.cs b/Content.Server/Salvage/SalvageSystem.Runner.cs
index 710fb9f84e..01f7340d42 100644
--- a/Content.Server/Salvage/SalvageSystem.Runner.cs
+++ b/Content.Server/Salvage/SalvageSystem.Runner.cs
@@ -122,9 +122,6 @@ public sealed partial class SalvageSystem
         // Run the basic mission timers (e.g. announcements, auto-FTL, completion, etc)
         while (query.MoveNext(out var uid, out var comp))
         {
-            if (comp.Completed)
-                continue;
-
             var remaining = comp.EndTime - _timing.CurTime;
 
             if (comp.Stage < ExpeditionStage.FinalCountdown && remaining < TimeSpan.FromSeconds(30))
@@ -174,6 +171,11 @@ public sealed partial class SalvageSystem
                     }
                 }
             }
+
+            if (remaining < TimeSpan.Zero)
+            {
+                QueueDel(uid);
+            }
         }
 
         // Mining missions: NOOP
-- 
2.51.2