More profile cleaning null checks

gurrenm3 · Apr 13, 2022 · c5cfb7e · c5cfb7e
1 parent 7335e55
commit c5cfb7e
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/BloonsTD6 Mod Helper/Api/ProfileManagement.cs b/BloonsTD6 Mod Helper/Api/ProfileManagement.cs
@@ -34,8 +34,7 @@ internal class ProfileManagement
         private static string primaryHero;
         private static readonly Dictionary<string, string> MapPrimaryHeroes = new Dictionary<string, string>();
 
-        private static readonly Dictionary<(string, int), string> MapPlayerHeroes =
-            new Dictionary<(string, int), string>();
+        private static readonly Dictionary<(string, int), string> MapPlayerHeroes = new Dictionary<(string, int), string>();
 
         private static readonly Dictionary<string, string> SelectedTowerSkinData = new Dictionary<string, string>();
 
@@ -45,7 +44,7 @@ private static void CleanProfile(ProfileModel profile, IReadOnlyCollection<strin
             MelonMain.PerformHook(mod => mod.PreCleanProfile(profile));
 
             CleanHashSet(profile.unlockedTowers, Clean("unlockedTower", towers, current), UnlockedTowers);
-            CleanDictionary(profile.analyticsKonFuze.towersPlacedByBaseName,
+            CleanDictionary(profile.analyticsKonFuze?.towersPlacedByBaseName,
                 Clean("towerPlacedByBaseName", towers.Concat(heroes).ToList(), current), TowersPlacedByBaseName);
             CleanDictionary(profile.towerXp, Clean("towerXp", towers, current), TowerXp);
 
@@ -59,13 +58,13 @@ private static void CleanProfile(ProfileModel profile, IReadOnlyCollection<strin
                 SeenNewHeroNotification);
             CleanDictionary(profile.selectedTowerSkinData, Clean("selectedTowerSkinData", heroes, current),
                 SelectedTowerSkinData);
-            CleanDictionary(profile.analyticsKonFuze.heroesPlacedByName, Clean("heroPlacedByName", heroes, current),
+            CleanDictionary(profile.analyticsKonFuze?.heroesPlacedByName, Clean("heroPlacedByName", heroes, current),
                 HeroesPlacedByName);
-            CleanDictionary(profile.analyticsKonFuze.heroLevelsByName, Clean("heroLevelsByName", heroes, current),
+            CleanDictionary(profile.analyticsKonFuze?.heroLevelsByName, Clean("heroLevelsByName", heroes, current),
                 HeroLevelsByName);
 
             SeenEvents.Clear();
-            profile.seenEvents.RemoveWhere(new Func<string, bool>(s =>
+            profile.seenEvents?.RemoveWhere(new Func<string, bool>(s =>
             {
                 foreach (var paragonEvent in ParagonEvents)
                 {
@@ -236,7 +235,7 @@ internal static void UnCleanProfile(ProfileModel profile)
 
             foreach (var ((map, player), hero) in MapPlayerHeroes)
             {
-                if (profile.savedMaps.ContainsKey(map))
+                if (profile.savedMaps?.ContainsKey(map) == true)
                 {
                     var mapSaveDataModel = profile.savedMaps[map];
                     if (mapSaveDataModel.players.ContainsKey(player))
@@ -253,7 +252,7 @@ private static Func<string, bool> Clean(string name, IReadOnlyCollection<string>
         {
             return thing =>
             {
-                if (string.IsNullOrEmpty(thing))
+                if (string.IsNullOrEmpty(thing) || things == null)
                 {
                     return false;
                 }
@@ -272,6 +271,10 @@ private static void CleanHashSet(Il2CppSystem.Collections.Generic.HashSet<string
             Func<string, bool> clean, HashSet<string> storage)
         {
             storage.Clear();
+            if (hashSet == null)
+            {
+                return;
+            }
 
             foreach (var thing in hashSet)
             {
@@ -291,6 +294,11 @@ private static void CleanDictionary<T>(Il2CppSystem.Collections.Generic.Dictiona
             Func<string, bool> clean, Dictionary<string, T> storage)
         {
             storage.Clear();
+            if (dictionary == null)
+            {
+                return;
+            }
+
             foreach (var (thing, value) in dictionary)
             {
                 if (clean(thing))