From a00b5c51d2704cb031b0e3cefdf23bebd55e0683 Mon Sep 17 00:00:00 2001
From: Jesse <jesse@archangel.wtf>
Date: Fri, 11 Jul 2025 15:52:33 +0200
Subject: [PATCH] More prestige fixes (#471)

* Only send message if there's items to be sent

* Update variable name

* Fix up incrementing a null integer
---
 .../Controllers/PrestigeController.cs                  |  2 +-
 .../Extensions/FullProfileExtensions.cs                |  9 +++++----
 .../SPTarkov.Server.Core/Helpers/PrestigeHelper.cs     | 10 +++++++++-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Libraries/SPTarkov.Server.Core/Controllers/PrestigeController.cs b/Libraries/SPTarkov.Server.Core/Controllers/PrestigeController.cs
index 75eb3586..8ef78453 100644
--- a/Libraries/SPTarkov.Server.Core/Controllers/PrestigeController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/PrestigeController.cs
@@ -66,7 +66,7 @@ public class PrestigeController(
         {
             var pendingPrestige = new PendingPrestige
             {
-                PrestigeLevel = profile.CharacterData.PmcData.Info.PrestigeLevel + 1,
+                PrestigeLevel = (profile.CharacterData?.PmcData?.Info?.PrestigeLevel ?? 0) + 1,
                 Items = request,
             };
 
diff --git a/Libraries/SPTarkov.Server.Core/Extensions/FullProfileExtensions.cs b/Libraries/SPTarkov.Server.Core/Extensions/FullProfileExtensions.cs
index 37193577..b6f013a7 100644
--- a/Libraries/SPTarkov.Server.Core/Extensions/FullProfileExtensions.cs
+++ b/Libraries/SPTarkov.Server.Core/Extensions/FullProfileExtensions.cs
@@ -129,10 +129,11 @@ namespace SPTarkov.Server.Core.Extensions
                     break;
             }
 
-            var pretigeLevel = fullProfile?.CharacterData?.PmcData?.Info?.PrestigeLevel;
-            if (pretigeLevel is not null)
+            var prestigeLevel = fullProfile?.CharacterData?.PmcData?.Info?.PrestigeLevel;
+
+            if (prestigeLevel is not null)
             {
-                if (pretigeLevel >= 1)
+                if (prestigeLevel >= 1)
                 {
                     fullProfile.CustomisationUnlocks.Add(
                         new CustomisationStorage
@@ -144,7 +145,7 @@ namespace SPTarkov.Server.Core.Extensions
                     );
                 }
 
-                if (pretigeLevel >= 2)
+                if (prestigeLevel >= 2)
                 {
                     fullProfile.CustomisationUnlocks.Add(
                         new CustomisationStorage
diff --git a/Libraries/SPTarkov.Server.Core/Helpers/PrestigeHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/PrestigeHelper.cs
index ff1fafd0..2eee2006 100644
--- a/Libraries/SPTarkov.Server.Core/Helpers/PrestigeHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/PrestigeHelper.cs
@@ -112,7 +112,15 @@ public class PrestigeHelper(
             itemsToTransfer.Add(item);
         }
 
-        mailSendService.SendSystemMessageToPlayer(sessionId.Value, "", itemsToTransfer, 31536000);
+        if (itemsToTransfer.Count > 0)
+        {
+            mailSendService.SendSystemMessageToPlayer(
+                sessionId.Value,
+                "",
+                itemsToTransfer,
+                31536000
+            );
+        }
 
         newProfile.CharacterData.PmcData.Info.PrestigeLevel = prestige.PrestigeLevel;
     }