Fix sponsors prototypes

space-syndicate · Feb 26, 2024 · cea2689 · cea2689
1 parent fe48e6d
commit cea2689
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/Content.Client/Preferences/ClientPreferencesManager.cs b/Content.Client/Preferences/ClientPreferencesManager.cs
@@ -68,7 +68,7 @@ public void SelectCharacter(int slot)
         public void UpdateCharacter(ICharacterProfile profile, int slot)
         {
             // Corvax-Sponsors-Start
-            var sponsorPrototypes = _sponsorsManager?.Prototypes.ToArray() ?? new string[]{};
+            var sponsorPrototypes = _sponsorsManager?.Prototypes.ToArray() ?? [];
             profile.EnsureValid(_cfg, _prototypes, sponsorPrototypes);
             // Corvax-Sponsors-End
             var characters = new Dictionary<int, ICharacterProfile>(Preferences.Characters) {[slot] = profile};

diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
@@ -106,7 +106,7 @@ private async void HandleUpdateCharacterMessage(MsgUpdateCharacter message)
             // WARN! It's not removing markings from DB!
             var sponsorPrototypes = _sponsors != null && _sponsors.TryGetPrototypes(message.MsgChannel.UserId, out var prototypes)
                 ? prototypes.ToArray()
-                : new string[]{};
+                : [];
             profile.EnsureValid(_cfg, _protos, sponsorPrototypes);
             // Corvax-Sponsors-End
             var profiles = new Dictionary<int, ICharacterProfile>(curPrefs.Characters)
@@ -206,8 +206,8 @@ async Task LoadPrefs()
                     {
                         var sponsorPrototypes = _sponsors != null && _sponsors.TryGetPrototypes(session.UserId, out var prototypes)
                             ? prototypes.ToArray()
-                            : new string[]{};
-                        profile.EnsureValid(sponsorPrototypes);
+                            : [];
+                        profile.EnsureValid(_cfg, _protos, sponsorPrototypes);
                     }
                     // Corvax-Sponsors-End
                     prefsData.Prefs = prefs;
@@ -285,17 +285,20 @@ private async Task<PlayerPreferences> GetOrCreatePreferencesAsync(NetUserId user
                 return await _db.InitPrefsAsync(userId, HumanoidCharacterProfile.Random());
             }
 
-            return SanitizePreferences(prefs);
+            // Corvax-Sponsors-Start
+            var sponsorPrototypes = _sponsors != null && _sponsors.TryGetPrototypes(userId, out var prototypes) ? prototypes.ToArray() : []; // Corvax-Sponsors
+            return SanitizePreferences(prefs, sponsorPrototypes);
+            // Corvax-Sponsors-End
         }
 
-        private PlayerPreferences SanitizePreferences(PlayerPreferences prefs)
+        private PlayerPreferences SanitizePreferences(PlayerPreferences prefs, string[] sponsorPrototypes)
         {
             // Clean up preferences in case of changes to the game,
             // such as removed jobs still being selected.
 
             return new PlayerPreferences(prefs.Characters.Select(p =>
             {
-                return new KeyValuePair<int, ICharacterProfile>(p.Key, p.Value.Validated(_cfg, _protos));
+                return new KeyValuePair<int, ICharacterProfile>(p.Key, p.Value.Validated(_cfg, _protos, sponsorPrototypes));
             }), prefs.SelectedCharacterIndex, prefs.AdminOOCColor);
         }
 

diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -564,10 +564,10 @@ public static bool CanHaveVoice(TTSVoicePrototype voice, Sex sex)
         }
         // Corvax-TTS-End
 
-        public ICharacterProfile Validated(IConfigurationManager configManager, IPrototypeManager prototypeManager)
+        public ICharacterProfile Validated(IConfigurationManager configManager, IPrototypeManager prototypeManager, string[] sponsorPrototypes)
         {
             var profile = new HumanoidCharacterProfile(this);
-            profile.EnsureValid(configManager, prototypeManager);
+            profile.EnsureValid(configManager, prototypeManager, sponsorPrototypes); // Corvax-Sponsors
             return profile;
         }
 

diff --git a/Content.Shared/Preferences/ICharacterProfile.cs b/Content.Shared/Preferences/ICharacterProfile.cs
@@ -20,6 +20,6 @@ public interface ICharacterProfile
         /// <summary>
         /// Gets a copy of this profile that has <see cref="EnsureValid"/> applied, i.e. no invalid data.
         /// </summary>
-        ICharacterProfile Validated(IConfigurationManager configManager, IPrototypeManager prototypeManager);
+        ICharacterProfile Validated(IConfigurationManager configManager, IPrototypeManager prototypeManager, string[] sponsorPrototypes);
     }
 }