Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix salvage deletion (#16502)

Browse Source
This commit is contained in:
metalgearsloth
2023-05-16 22:55:49 +10:00
committed by GitHub
parent 64bb57cdef
commit e468017152
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Salvage/SalvageSystem.Expeditions.cs
View File

@@ -146,16 +146,6 @@ public sealed partial class SalvageSystem
GenerateMissions(comp); GenerateMissions(comp);
UpdateConsoles(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) private void FinishExpedition(SalvageExpeditionDataComponent component, SalvageExpeditionComponent expedition, EntityUid? shuttle)

8
Content.Server/Salvage/SalvageSystem.Runner.cs
View File

@@ -122,9 +122,6 @@ public sealed partial class SalvageSystem
// Run the basic mission timers (e.g. announcements, auto-FTL, completion, etc) // Run the basic mission timers (e.g. announcements, auto-FTL, completion, etc)
while (query.MoveNext(out var uid, out var comp)) while (query.MoveNext(out var uid, out var comp))
{ {
if (comp.Completed)
continue;
var remaining = comp.EndTime - _timing.CurTime; var remaining = comp.EndTime - _timing.CurTime;
if (comp.Stage < ExpeditionStage.FinalCountdown && remaining < TimeSpan.FromSeconds(30)) 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 // Mining missions: NOOP