Fix crash when loading a terrain generator preset that contained a no…

…nexistent TileSet
CnCNet · Aug 28, 2023 · bc7370c · bc7370c
1 parent fcd2e94
commit bc7370c
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 13 deletions.
diff --git a/src/TSMapEditor/Mutations/Classes/TerrainGenerationMutation.cs b/src/TSMapEditor/Mutations/Classes/TerrainGenerationMutation.cs
@@ -94,9 +94,13 @@ public static TerrainGeneratorConfiguration FromConfigSection(IniSection section
 
                 var terrainTypeGroup = TerrainGeneratorTerrainTypeGroup.FromConfigString(terrainTypes, value);
                 if (terrainTypeGroup == null)
-                    continue;
-
-                terrainTypeGroups.Add(terrainTypeGroup);
+                {
+                    Logger.Log($"Failed to load terrain type group #{i} from terrain generator configuration section {section.SectionName}. User preset: {isUserConfiguration}");
+                }
+                else
+                {
+                    terrainTypeGroups.Add(terrainTypeGroup);
+                }
 
                 i++;
             }
@@ -110,9 +114,13 @@ public static TerrainGeneratorConfiguration FromConfigSection(IniSection section
 
                 var tileGroup = TerrainGeneratorTileGroup.FromConfigString(tilesets, value);
                 if (tileGroup == null)
-                    continue;
-
-                tileGroups.Add(tileGroup);
+                {
+                    Logger.Log($"Failed to load tile group #{i} from terrain generator configuration section {section.SectionName}. User preset: {isUserConfiguration}");
+                }
+                else
+                {
+                    tileGroups.Add(tileGroup);
+                }
 
                 i++;
             }
@@ -126,9 +134,13 @@ public static TerrainGeneratorConfiguration FromConfigSection(IniSection section
 
                 var overlayGroup = TerrainGeneratorOverlayGroup.FromConfigString(overlayTypes, value);
                 if (overlayGroup == null)
-                    continue;
-
-                overlayGroups.Add(overlayGroup);
+                {
+                    Logger.Log($"Failed to load overlay group #{i} from terrain generator configuration section {section.SectionName}. User preset: {isUserConfiguration}");
+                }
+                else
+                {
+                    overlayGroups.Add(overlayGroup);
+                }
 
                 i++;
             }
@@ -142,9 +154,13 @@ public static TerrainGeneratorConfiguration FromConfigSection(IniSection section
 
                 var smudgeGroup = TerrainGeneratorSmudgeGroup.FromConfigString(smudgeTypes, value);
                 if (smudgeGroup == null)
-                    continue;
-
-                smudgeGroups.Add(smudgeGroup);
+                {
+                    Logger.Log($"Failed to load smudge group #{i} from terrain generator configuration section {section.SectionName}. User preset: {isUserConfiguration}");
+                }
+                else
+                {
+                    smudgeGroups.Add(smudgeGroup);
+                }
 
                 i++;
             }
@@ -201,7 +217,7 @@ public class TerrainGeneratorTileGroup
     {
         public TerrainGeneratorTileGroup(TileSet tileSet, List<int> tileIndicesInSet, double openChance, double overlapChance)
         {
-            TileSet = tileSet;
+            TileSet = tileSet ?? throw new ArgumentNullException(nameof(tileSet));
             TileIndicesInSet = tileIndicesInSet;
             OpenChance = openChance;
             OverlapChance = overlapChance;
@@ -233,6 +249,9 @@ public static TerrainGeneratorTileGroup FromConfigString(List<TileSet> allTileSe
             double openChance = Conversions.DoubleFromString(parts[0], 0.0);
             double overlapChance = Conversions.DoubleFromString(parts[1], 0.0);
             var tileSet = allTileSets.Find(ts => ts.AllowToPlace && ts.LoadedTileCount > 0 && ts.SetName == parts[2]);
+            if (tileSet == null)
+                return null;
+
             List<int> tileIndices = null;
             if (parts.Length > 3)
             {

diff --git a/src/TSMapEditor/Settings/TerrainGeneratorUserPresets.cs b/src/TSMapEditor/Settings/TerrainGeneratorUserPresets.cs
@@ -42,6 +42,7 @@ public void Load()
                     break;
 
                 var config = TerrainGeneratorConfiguration.FromConfigSection(iniSection, map.Rules, map.TheaterInstance.Theater, true);
+
                 if (config != null)
                     configurations.Add(config);
                 else