From 7ec29e1e123dc9716db616d6964fd677793aa9c3 Mon Sep 17 00:00:00 2001 From: Chomp Date: Mon, 8 Sep 2025 13:08:10 +0100 Subject: [PATCH] Converted `FlagCultistCircleCraftAsComplete` into extension method --- .../Extensions/ProductionExtensions.cs | 13 +++++++++++++ .../Helpers/HideoutHelper.cs | 16 +++------------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Libraries/SPTarkov.Server.Core/Extensions/ProductionExtensions.cs b/Libraries/SPTarkov.Server.Core/Extensions/ProductionExtensions.cs index 78300aeb..a66851f9 100644 --- a/Libraries/SPTarkov.Server.Core/Extensions/ProductionExtensions.cs +++ b/Libraries/SPTarkov.Server.Core/Extensions/ProductionExtensions.cs @@ -41,4 +41,17 @@ public static class ProductionExtensions return false; } } + + /// + /// Craft has completed, update its properties to reflect its new state + /// + /// Craft to update + public static void FlagCultistCircleCraftAsComplete(this Production production) + { + production.AvailableForFinish = true; + + // The client expects `Progress` to be 0, and `inProgress` to be false when a circle is complete + production.Progress = 0; + production.InProgress = false; + } } diff --git a/Libraries/SPTarkov.Server.Core/Helpers/HideoutHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/HideoutHelper.cs index c6ed88d9..963edb4e 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/HideoutHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/HideoutHelper.cs @@ -511,24 +511,14 @@ public class HideoutHelper( // Check if craft is complete if (production.Progress >= production.ProductionTime) { - FlagCultistCircleCraftAsComplete(production); + production.FlagCultistCircleCraftAsComplete(); } return; } - // Craft in complete - FlagCultistCircleCraftAsComplete(production); - } - - protected static void FlagCultistCircleCraftAsComplete(Production production) - { - // Craft is complete, flag as such - production.AvailableForFinish = true; - - // The client expects `Progress` to be 0, and `inProgress` to be false when a circle is complete - production.Progress = 0; - production.InProgress = false; + // Craft is complete + production.FlagCultistCircleCraftAsComplete(); } ///