From 99e4a4a1ccf5dcbe0e4b1af7591e229a0eeae447 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Fri, 21 Sep 2018 18:25:33 -0400
Subject: [PATCH] fix crash when mods add an invalid location with no name

---
 docs/release-notes.md                                  |  1 +
 .../Framework/StateTracking/WorldLocationsTracker.cs   | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/release-notes.md b/docs/release-notes.md
index f6119d23..6360f3e7 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -5,6 +5,7 @@
   * Moved most SMAPI files into a `smapi-internal` subfolder.
   * Moved save backups into a `save-backups` subfolder (instead of `Mods/SaveBackup/backups`). Note that previous backups will be deleted when you update.
   * Update checks now work even when the mod has no update keys in most cases.
+  * Fixed error when mods add an invalid location with no name.
   * Fixed compatibility issues for some Linux players. SMAPI will now always use xterm if it's available.
   * Fixed some game install paths not detected on Windows.
   * Fixed installer duplicating bundled mods if you moved them after the last install.
diff --git a/src/SMAPI/Framework/StateTracking/WorldLocationsTracker.cs b/src/SMAPI/Framework/StateTracking/WorldLocationsTracker.cs
index d9090c08..5a259663 100644
--- a/src/SMAPI/Framework/StateTracking/WorldLocationsTracker.cs
+++ b/src/SMAPI/Framework/StateTracking/WorldLocationsTracker.cs
@@ -1,6 +1,8 @@
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using StardewModdingAPI.Framework.StateTracking.Comparers;
 using StardewModdingAPI.Framework.StateTracking.FieldWatchers;
 using StardewValley;
 using StardewValley.Buildings;
@@ -18,10 +20,10 @@ namespace StardewModdingAPI.Framework.StateTracking
         private readonly ICollectionWatcher<GameLocation> LocationListWatcher;
 
         /// <summary>A lookup of the tracked locations.</summary>
-        private IDictionary<GameLocation, LocationTracker> LocationDict { get; } = new Dictionary<GameLocation, LocationTracker>();
+        private IDictionary<GameLocation, LocationTracker> LocationDict { get; } = new Dictionary<GameLocation, LocationTracker>(new ObjectReferenceComparer<GameLocation>());
 
         /// <summary>A lookup of registered buildings and their indoor location.</summary>
-        private readonly IDictionary<Building, GameLocation> BuildingIndoors = new Dictionary<Building, GameLocation>();
+        private readonly IDictionary<Building, GameLocation> BuildingIndoors = new Dictionary<Building, GameLocation>(new ObjectReferenceComparer<Building>());
 
 
         /*********
@@ -37,10 +39,10 @@ namespace StardewModdingAPI.Framework.StateTracking
         public IEnumerable<LocationTracker> Locations => this.LocationDict.Values;
 
         /// <summary>The locations removed since the last update.</summary>
-        public ICollection<GameLocation> Added { get; } = new HashSet<GameLocation>();
+        public ICollection<GameLocation> Added { get; } = new HashSet<GameLocation>(new ObjectReferenceComparer<GameLocation>());
 
         /// <summary>The locations added since the last update.</summary>
-        public ICollection<GameLocation> Removed { get; } = new HashSet<GameLocation>();
+        public ICollection<GameLocation> Removed { get; } = new HashSet<GameLocation>(new ObjectReferenceComparer<GameLocation>());
 
 
         /*********