Merge branch '3.10.0-DEV' of https://dev.sp-tarkov.com/SPT/Server into 3.10.0-DEV

project/assets/database/traders/54cb50c76803fa8b248b4571/base.json

@@ -122,6 +122,5 @@
     "category": [],
     "id_list": []
   },
-  "unlockedByDefault": true,
-  "refreshTraderRagfairOffers": false
-}
+  "unlockedByDefault": true
+}

project/src/helpers/ProfileHelper.ts

@@ -80,21 +80,24 @@ export class ProfileHelper {
             return output;
         }
 
-        const fullProfile = this.getFullProfile(sessionId);
+        const fullProfileClone = this.cloner.clone(this.getFullProfile(sessionId));
+
+        // Sanitize any data the client can not receive
+        this.sanitizeProfileForClient(fullProfileClone);
 
         // Edge-case, true post raid
         if (this.profileSnapshotService.hasProfileSnapshot(sessionId)) {
             return this.postRaidXpWorkaroundFix(
                 sessionId,
-                fullProfile.characters.pmc,
-                fullProfile.characters.scav,
+                fullProfileClone.characters.pmc,
+                fullProfileClone.characters.scav,
                 output,
             );
         }
 
         // PMC must be at array index 0, scav at 1
-        output.push(fullProfile.characters.pmc);
-        output.push(fullProfile.characters.scav);
+        output.push(fullProfileClone.characters.pmc);
+        output.push(fullProfileClone.characters.scav);
 
         return output;
     }
@@ -113,13 +116,10 @@ export class ProfileHelper {
      */
     protected postRaidXpWorkaroundFix(
         sessionId: string,
-        pmcProfile: IPmcData,
-        scavProfile: IPmcData,
+        clonedPmc: IPmcData,
+        clonedScav: IPmcData,
         output: IPmcData[],
     ): IPmcData[] {
-        const clonedPmc = this.cloner.clone(pmcProfile);
-        const clonedScav = this.cloner.clone(scavProfile);
-
         const profileSnapshot = this.profileSnapshotService.getProfileSnapshot(sessionId);
         clonedPmc.Info.Level = profileSnapshot.characters.pmc.Info.Level;
         clonedPmc.Info.Experience = profileSnapshot.characters.pmc.Info.Experience;
@@ -135,6 +135,18 @@ export class ProfileHelper {
         return output;
     }
 
+    /**
+     * Sanitize any information from the profile that the client does not expect to receive
+     * @param clonedProfile A clone of the full player profile
+     */
+    protected sanitizeProfileForClient(clonedProfile: ISptProfile) {
+        // Remove `loyaltyLevel` from `TradersInfo`, as otherwise it causes the client to not
+        // properly calculate the player's `loyaltyLevel`
+        for (const traderInfo of Object.values(clonedProfile.characters.pmc.TradersInfo)) {
+            traderInfo.loyaltyLevel = undefined;
+        }
+    }
+
     /**
      * Check if a nickname is used by another profile loaded by the server
      * @param nicknameRequest nickname request object

project/src/models/eft/common/tables/IBotBase.ts

@@ -458,7 +458,7 @@ export interface IQuestStatus {
 }
 
 export interface TraderInfo {
-    loyaltyLevel: number;
+    loyaltyLevel?: number;
     salesSum: number;
     standing: number;
     nextResupply: number;