From fe2e04b9f8316eea622cb6d8ae51f7b0f76204da Mon Sep 17 00:00:00 2001 From: CWX Date: Tue, 27 May 2025 18:54:53 +0100 Subject: [PATCH] put logging in debug, fix commit not being added to end of version --- Libraries/SPTarkov.Server.Core/Utils/ProgramStatics.cs | 2 ++ Libraries/SPTarkov.Server.Core/Utils/Watermark.cs | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Libraries/SPTarkov.Server.Core/Utils/ProgramStatics.cs b/Libraries/SPTarkov.Server.Core/Utils/ProgramStatics.cs index 8672f19a..d26d9c0d 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/ProgramStatics.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/ProgramStatics.cs @@ -40,10 +40,12 @@ public static partial class ProgramStatics break; } +#if DEBUG Console.WriteLine($"SPTarkov.Server.Core: entrytype: {_entryType}"); Console.WriteLine($"SPTarkov.Server.Core: debug: {_debug}"); Console.WriteLine($"SPTarkov.Server.Core: compiled: {_compiled}"); Console.WriteLine($"SPTarkov.Server.Core: mods: {_mods}"); +#endif } // Public Static Getters diff --git a/Libraries/SPTarkov.Server.Core/Utils/Watermark.cs b/Libraries/SPTarkov.Server.Core/Utils/Watermark.cs index eb83035f..2b458e58 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/Watermark.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/Watermark.cs @@ -149,10 +149,8 @@ public class Watermark /// label text public string GetInGameVersionLabel() { - var sptVersion = /*ProgramStatics.SPT_VERSION ||*/ sptConfig.SptVersion; - var versionTag = /*ProgramStatics.DEBUG ? */ - $"{sptVersion} - BLEEDINGEDGE { /*ProgramStatics.COMMIT?.slice(0, 6) ?? */""}"; - //: `{sptVersion} - {ProgramStatics.COMMIT?.slice(0, 6) ?? ""}`; + var sptVersion = ProgramStatics.SPT_VERSION(); + var versionTag = ProgramStatics.DEBUG() ? $"{sptVersion} - BLEEDINGEDGE {ProgramStatics.COMMIT()?.Substring(0, 6) ?? ""}" : $"{sptVersion} - {ProgramStatics.COMMIT()?.Substring(0, 6) ?? ""}"; return $"{sptConfig.ProjectName} {versionTag}"; }