Fix map data processor crash when duplicate berry ID appears before a…

…ny with ID -1
EverestAPI · Dec 16, 2022 · 491f999 · 491f999
1 parent 4e753ad
commit 491f999
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/Celeste.Mod.mm/Mod/Core/CoreMapDataProcessor.cs b/Celeste.Mod.mm/Mod/Core/CoreMapDataProcessor.cs
@@ -246,6 +246,9 @@ public override void Reset() {
                             }
                             if (PlacedBerriesPerCheckpoint[checkpoint].ContainsKey(order)) {
                                 Logger.Log(LogLevel.Warn, "core", $"Duplicate berry order {order} in checkpoint {checkpoint} of map {Mode.Path}. Reassigning berry order.");
+                                if (!AutomaticBerriesPerCheckpoint.ContainsKey(checkpoint)) {
+                                    AutomaticBerriesPerCheckpoint[checkpoint] = new List<BinaryPacker.Element>();
+                                }
                                 AutomaticBerriesPerCheckpoint[checkpoint].Add(entity); // treat duplicate order as -1
                             } else {
                                 PlacedBerriesPerCheckpoint[checkpoint][order] = entity;