recover save when mods leave null objects in the world

1 files changed, 13 insertions, 0 deletions

diff --git a/src/SMAPI.Mods.ErrorHandler/Patches/SaveGamePatcher.cs b/src/SMAPI.Mods.ErrorHandler/Patches/SaveGamePatcher.cs
index 635a01c1..2a43cb10 100644
--- a/src/SMAPI.Mods.ErrorHandler/Patches/SaveGamePatcher.cs
+++ b/src/SMAPI.Mods.ErrorHandler/Patches/SaveGamePatcher.cs
@@ -8,6 +8,7 @@ using StardewModdingAPI.Internal.Patching;
 using StardewValley;
 using StardewValley.Buildings;
 using StardewValley.Locations;
+using SObject = StardewValley.Object;
 
 namespace StardewModdingAPI.Mods.ErrorHandler.Patches
 {
@@ -126,6 +127,18 @@ namespace StardewModdingAPI.Mods.ErrorHandler.Patches
                 }
             }
 
+            // check objects
+            foreach (var pair in location.objects.Pairs.ToArray())
+            {
+                // SpaceCore can leave null values when removing its custom content
+                if (pair.Value == null)
+                {
+                    location.Objects.Remove(pair.Key);
+                    SaveGamePatcher.Monitor.Log($"Removed invalid null object in {location.Name} ({pair.Key}) to avoid a crash when loading save '{Constants.SaveFolderName}'. (Did you remove a custom item mod?)", LogLevel.Warn);
+                    removedAny = true;
+                }
+            }
+
             return removedAny;
         }
     }