From 65d8d7432dacca0fc72e9dcda631a605a5684f74 Mon Sep 17 00:00:00 2001
From: Chomp <dev@dev.sp-tarkov.com>
Date: Sat, 28 Jun 2025 09:00:23 +0100
Subject: [PATCH] Converted `DefaultVitality` into extension method

---
 .../Extensions/VitalityExtensions.cs          | 79 +++++++++++++++++++
 .../Helpers/HealthHelper.cs                   | 77 +-----------------
 .../SPTarkov.Server.Core.csproj               | 17 +---
 3 files changed, 85 insertions(+), 88 deletions(-)
 create mode 100644 Libraries/SPTarkov.Server.Core/Extensions/VitalityExtensions.cs

diff --git a/Libraries/SPTarkov.Server.Core/Extensions/VitalityExtensions.cs b/Libraries/SPTarkov.Server.Core/Extensions/VitalityExtensions.cs
new file mode 100644
index 00000000..b3839475
--- /dev/null
+++ b/Libraries/SPTarkov.Server.Core/Extensions/VitalityExtensions.cs
@@ -0,0 +1,79 @@
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+
+namespace SPTarkov.Server.Core.Extensions
+{
+    public static class VitalityExtensions
+    {
+        public static void SetDefaults(this Vitality? vitality)
+        {
+            vitality ??= new Vitality
+            {
+                Health = null,
+                Energy = 0,
+                Temperature = 0,
+                Hydration = 0,
+            };
+
+            vitality.Health = new Dictionary<string, BodyPartHealth>
+            {
+                {
+                    "Head",
+                    new BodyPartHealth
+                    {
+                        Health = new CurrentMinMax { Current = 0 },
+                        Effects = new Dictionary<string, BodyPartEffectProperties>(),
+                    }
+                },
+                {
+                    "Chest",
+                    new BodyPartHealth
+                    {
+                        Health = new CurrentMinMax { Current = 0 },
+                        Effects = new Dictionary<string, BodyPartEffectProperties>(),
+                    }
+                },
+                {
+                    "Stomach",
+                    new BodyPartHealth
+                    {
+                        Health = new CurrentMinMax { Current = 0 },
+                        Effects = new Dictionary<string, BodyPartEffectProperties>(),
+                    }
+                },
+                {
+                    "LeftArm",
+                    new BodyPartHealth
+                    {
+                        Health = new CurrentMinMax { Current = 0 },
+                        Effects = new Dictionary<string, BodyPartEffectProperties>(),
+                    }
+                },
+                {
+                    "RightArm",
+                    new BodyPartHealth
+                    {
+                        Health = new CurrentMinMax { Current = 0 },
+                        Effects = new Dictionary<string, BodyPartEffectProperties>(),
+                    }
+                },
+                {
+                    "LeftLeg",
+                    new BodyPartHealth
+                    {
+                        Health = new CurrentMinMax { Current = 0 },
+                        Effects = new Dictionary<string, BodyPartEffectProperties>(),
+                    }
+                },
+                {
+                    "RightLeg",
+                    new BodyPartHealth
+                    {
+                        Health = new CurrentMinMax { Current = 0 },
+                        Effects = new Dictionary<string, BodyPartEffectProperties>(),
+                    }
+                },
+            };
+        }
+    }
+}
diff --git a/Libraries/SPTarkov.Server.Core/Helpers/HealthHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/HealthHelper.cs
index 7433363e..907d39b9 100644
--- a/Libraries/SPTarkov.Server.Core/Helpers/HealthHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/HealthHelper.cs
@@ -1,4 +1,5 @@
 using SPTarkov.DI.Annotations;
+using SPTarkov.Server.Core.Extensions;
 using SPTarkov.Server.Core.Models.Eft.Common;
 using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 using SPTarkov.Server.Core.Models.Eft.Profile;
@@ -6,7 +7,6 @@ using SPTarkov.Server.Core.Models.Spt.Config;
 using SPTarkov.Server.Core.Servers;
 using SPTarkov.Server.Core.Utils;
 using BodyPartHealth = SPTarkov.Server.Core.Models.Eft.Common.Tables.BodyPartHealth;
-using Vitality = SPTarkov.Server.Core.Models.Eft.Profile.Vitality;
 
 namespace SPTarkov.Server.Core.Helpers;
 
@@ -18,7 +18,7 @@ public class HealthHelper(
     ConfigServer _configServer
 )
 {
-    protected HealthConfig _healthConfig = _configServer.GetConfig<HealthConfig>();
+    protected readonly HealthConfig _healthConfig = _configServer.GetConfig<HealthConfig>();
 
     /// <summary>
     ///     Resets the profiles vitality/health and vitality/effects properties to their defaults
@@ -29,82 +29,11 @@ public class HealthHelper(
     {
         var profile = _saveServer.GetProfile(sessionID);
 
-        DefaultVitality(profile.VitalityData);
+        profile.VitalityData.SetDefaults();
 
         return profile;
     }
 
-    public void DefaultVitality(Vitality? vitality)
-    {
-        vitality ??= new Vitality
-        {
-            Health = null,
-            Energy = 0,
-            Temperature = 0,
-            Hydration = 0,
-        };
-
-        vitality.Health = new Dictionary<string, BodyPartHealth>
-        {
-            {
-                "Head",
-                new BodyPartHealth
-                {
-                    Health = new CurrentMinMax { Current = 0 },
-                    Effects = new Dictionary<string, BodyPartEffectProperties>(),
-                }
-            },
-            {
-                "Chest",
-                new BodyPartHealth
-                {
-                    Health = new CurrentMinMax { Current = 0 },
-                    Effects = new Dictionary<string, BodyPartEffectProperties>(),
-                }
-            },
-            {
-                "Stomach",
-                new BodyPartHealth
-                {
-                    Health = new CurrentMinMax { Current = 0 },
-                    Effects = new Dictionary<string, BodyPartEffectProperties>(),
-                }
-            },
-            {
-                "LeftArm",
-                new BodyPartHealth
-                {
-                    Health = new CurrentMinMax { Current = 0 },
-                    Effects = new Dictionary<string, BodyPartEffectProperties>(),
-                }
-            },
-            {
-                "RightArm",
-                new BodyPartHealth
-                {
-                    Health = new CurrentMinMax { Current = 0 },
-                    Effects = new Dictionary<string, BodyPartEffectProperties>(),
-                }
-            },
-            {
-                "LeftLeg",
-                new BodyPartHealth
-                {
-                    Health = new CurrentMinMax { Current = 0 },
-                    Effects = new Dictionary<string, BodyPartEffectProperties>(),
-                }
-            },
-            {
-                "RightLeg",
-                new BodyPartHealth
-                {
-                    Health = new CurrentMinMax { Current = 0 },
-                    Effects = new Dictionary<string, BodyPartEffectProperties>(),
-                }
-            },
-        };
-    }
-
     /// <summary>
     ///     Update player profile vitality values with changes from client request object
     /// </summary>
diff --git a/Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj b/Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj
index c86a3248..83a3cbe4 100644
--- a/Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj
+++ b/Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj
@@ -32,22 +32,11 @@
     <!--  BuildType options - LOCAL, DEBUG, RELEASE, BLEEDING_EDGE, BLEEDING_EDGE_MODS - *must be all caps*-->
   </PropertyGroup>
   <Target Name="AfterEverythingDone" AfterTargets="PostBuildEvent">
-    <Exec
-      ConsoleToMsBuild="true"
-      Condition="'$(IsPublish)' == 'true'"
-      Command="dotnet build -c $(Configuration) $(MSBuildProjectDirectory)/../../Patches/Ceciler.Virtualizer/Ceciler.Virtualizer.csproj"
-    />
-    <Exec
-      ConsoleToMsBuild="true"
-      Command="dotnet &quot;$(MSBuildProjectDirectory)/../../Ceciler/Ceciler.Launcher.dll&quot; &quot;$(OutDir)SPTarkov.Server.Core.dll&quot; &quot;$(MSBuildProjectDirectory)/../../Patches/Ceciler.Virtualizer/bin/$(Configuration)/$(TargetFramework)/Ceciler.Virtualizer.dll&quot;"
-    />
+    <Exec ConsoleToMsBuild="true" Condition="'$(IsPublish)' == 'true'" Command="dotnet build -c $(Configuration) $(MSBuildProjectDirectory)/../../Patches/Ceciler.Virtualizer/Ceciler.Virtualizer.csproj" />
+    <Exec ConsoleToMsBuild="true" Command="dotnet &quot;$(MSBuildProjectDirectory)/../../Ceciler/Ceciler.Launcher.dll&quot; &quot;$(OutDir)SPTarkov.Server.Core.dll&quot; &quot;$(MSBuildProjectDirectory)/../../Patches/Ceciler.Virtualizer/bin/$(Configuration)/$(TargetFramework)/Ceciler.Virtualizer.dll&quot;" />
   </Target>
   <!--  Generates the ProgramStatics class with the build information -->
   <Target Name="GenerateProgramStatics" BeforeTargets="BeforeBuild">
-    <WriteLinesToFile
-      File="Utils/ProgramStatics.Generated.cs"
-      Lines="&#xD;&#xA;using SPTarkov.Server.Core.Models.Enums%3B&#xD;&#xA;&#xD;&#xA;namespace SPTarkov.Server.Core.Utils%3B&#xD;&#xA;&#xD;&#xA;public static partial class ProgramStatics&#xD;&#xA;{&#xD;&#xA;    private static string? _sptVersion = &quot;$(SptVersion)&quot;%3B&#xD;&#xA;    private static string? _commit = &quot;$(SptCommit)&quot;%3B&#xD;&#xA;    private static double? _buildTime = $(SptBuildTime)%3B&#xD;&#xA;    private static EntryType? BuildType = EntryType.$(SptBuildType)%3B&#xD;&#xA;}&#xD;&#xA;"
-      Overwrite="true"
-    />
+    <WriteLinesToFile File="Utils/ProgramStatics.Generated.cs" Lines="&#xD;&#xA;using SPTarkov.Server.Core.Models.Enums%3B&#xD;&#xA;&#xD;&#xA;namespace SPTarkov.Server.Core.Utils%3B&#xD;&#xA;&#xD;&#xA;public static partial class ProgramStatics&#xD;&#xA;{&#xD;&#xA;    private static string? _sptVersion = &quot;$(SptVersion)&quot;%3B&#xD;&#xA;    private static string? _commit = &quot;$(SptCommit)&quot;%3B&#xD;&#xA;    private static double? _buildTime = $(SptBuildTime)%3B&#xD;&#xA;    private static EntryType? BuildType = EntryType.$(SptBuildType)%3B&#xD;&#xA;}&#xD;&#xA;" Overwrite="true" />
   </Target>
 </Project>