chillcog/SPT-Server-Build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/sp-tarkov/server-csharp into develop

Browse Source
This commit is contained in:
Chomp
2025-04-16 11:56:21 +01:00
parent 00e94e2f25 e55aba79ac
commit 362a9cc758
7 changed files with 57 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/SPTarkov.Server.Core/Loaders/PostDBModLoader.cs
+9 -5
View File
@@ -2,6 +2,7 @@ using SPTarkov.Server.Core.DI;
using SPTarkov.Server.Core.Models.External;
using SPTarkov.Server.Core.Models.Utils;
using SPTarkov.Common.Annotations;
using SPTarkov.Server.Core.Utils;
namespace SPTarkov.Server.Core.Loaders;
@@ -13,13 +14,16 @@ public class PostDBModLoader(
{
public async Task OnLoad()
{
_logger.Info("Loading PostDBLoadMod...");
foreach (var postDbLoadMod in _postDbLoadMods)
if (ProgramStatics.MODS())
{
postDbLoadMod.PostDBLoad();
}
_logger.Info("Loading PostDBMods...");
foreach (var postDbLoadMod in _postDbLoadMods)
{
postDbLoadMod.PostDBLoad();
}
_logger.Info("Finished loading PostDBLoadMod...");
_logger.Info("Finished loading PostDBMods...");
}
}
public string GetRoute()
Libraries/SPTarkov.Server.Core/Loaders/PostSptModLoader.cs
+6 -9
View File
@@ -16,17 +16,14 @@ public class PostSptModLoader(
{
if (ProgramStatics.MODS())
{
// await _postSptModLoader.load();
// TODO: Huh?
}
_logger.Info("Loading PostSptMods...");
foreach (var postSptLoadMod in _postSptLoadMods)
{
postSptLoadMod.PostSptLoad();
}
_logger.Info("Loading PostSptMods...");
foreach (var postSptLoadMod in _postSptLoadMods)
{
postSptLoadMod.PostSptLoad();
_logger.Info("Finished loading PostSptMods...");
}
_logger.Info("Finished loading PostSptMods...");
}
public string GetRoute()
Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj
+3 -2
View File
@@ -30,13 +30,14 @@
<PropertyGroup>
<!-- SPT specific -->
<!-- using publish - provide flag to disable modding -p:DisableModding=true -->
<SptVersion Condition="'$(SptVersion)' == ''">0.0.0</SptVersion>
<SptVersion Condition="'$(SptVersion)' == ''">4.0.0</SptVersion>
<SptCommit Condition="'$(SptCommit)' == ''">a12b34</SptCommit>
<SptBuildTime Condition="'$(SptBuildTime)' == ''">0000000000</SptBuildTime>
<SptBuildType Condition="'$(SptBuildType)' == ''">LOCAL</SptBuildType>
<!-- BuildType options - LOCAL, DEBUG, RELEASE, BLEEDING_EDGE, BLEEDING_EDGE_MODS - *must be all caps*-->
</PropertyGroup>
<!-- Generates the ProgramStatics class with the build information -->
<Target Name="GenerateProgramStatics" BeforeTargets="BeforeBuild">
<WriteLinesToFile
File="Utils/ProgramStatics.Generated.cs"
Libraries/SPTarkov.Server.Core/Utils/ProgramStatics.Generated.cs
+1 -1
View File
@@ -4,7 +4,7 @@ namespace SPTarkov.Server.Core.Utils;
public static partial class ProgramStatics
{
private static string? _sptVersion = "0.0.0";
private static string? _sptVersion = "4.0.0";
private static string? _commit = "a12b34";
private static double? _buildTime = 0000000000;
private static EntryType? BuildType = EntryType.LOCAL;