From a29e2c59d4a01d5b8828644efd6becabc59af28e Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sat, 2 Jun 2018 01:04:02 -0400
Subject: disambiguate legacy events internally (#310)

---
 src/SMAPI/Events/IWorldEvents.cs   |  5 +----
 src/SMAPI/Events/LocationEvents.cs | 12 ++++++------
 2 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/SMAPI/Events')

diff --git a/src/SMAPI/Events/IWorldEvents.cs b/src/SMAPI/Events/IWorldEvents.cs
index 6a43baf2..067a79bc 100644
--- a/src/SMAPI/Events/IWorldEvents.cs
+++ b/src/SMAPI/Events/IWorldEvents.cs
@@ -2,12 +2,9 @@ using System;
 
 namespace StardewModdingAPI.Events
 {
-    /// <summary>Provides events raised when something changes in the world.</summary>
+    /// <summary>Events raised when something changes in the world.</summary>
     public interface IWorldEvents
     {
-        /*********
-        ** Events
-        *********/
         /// <summary>Raised after a game location is added or removed.</summary>
         event EventHandler<WorldLocationListChangedEventArgs> LocationListChanged;
 
diff --git a/src/SMAPI/Events/LocationEvents.cs b/src/SMAPI/Events/LocationEvents.cs
index ff75c619..e2108de0 100644
--- a/src/SMAPI/Events/LocationEvents.cs
+++ b/src/SMAPI/Events/LocationEvents.cs
@@ -19,22 +19,22 @@ namespace StardewModdingAPI.Events
         /// <summary>Raised after a game location is added or removed.</summary>
         public static event EventHandler<EventArgsLocationsChanged> LocationsChanged
         {
-            add => LocationEvents.EventManager.Location_LocationsChanged.Add(value);
-            remove => LocationEvents.EventManager.Location_LocationsChanged.Remove(value);
+            add => LocationEvents.EventManager.Legacy_Location_LocationsChanged.Add(value);
+            remove => LocationEvents.EventManager.Legacy_Location_LocationsChanged.Remove(value);
         }
 
         /// <summary>Raised after buildings are added or removed in a location.</summary>
         public static event EventHandler<EventArgsLocationBuildingsChanged> BuildingsChanged
         {
-            add => LocationEvents.EventManager.Location_BuildingsChanged.Add(value);
-            remove => LocationEvents.EventManager.Location_BuildingsChanged.Remove(value);
+            add => LocationEvents.EventManager.Legacy_Location_BuildingsChanged.Add(value);
+            remove => LocationEvents.EventManager.Legacy_Location_BuildingsChanged.Remove(value);
         }
 
         /// <summary>Raised after objects are added or removed in a location.</summary>
         public static event EventHandler<EventArgsLocationObjectsChanged> ObjectsChanged
         {
-            add => LocationEvents.EventManager.Location_ObjectsChanged.Add(value);
-            remove => LocationEvents.EventManager.Location_ObjectsChanged.Remove(value);
+            add => LocationEvents.EventManager.Legacy_Location_ObjectsChanged.Add(value);
+            remove => LocationEvents.EventManager.Legacy_Location_ObjectsChanged.Remove(value);
         }
 
 
-- 
cgit