From 558fb8a865b638cf5536856e7dcab44823feeaf3 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Thu, 31 May 2018 22:47:56 -0400
Subject: move location events into new event system (#310)

---
 src/SMAPI/Framework/Events/ManagedEventBase.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/SMAPI/Framework/Events/ManagedEventBase.cs')

diff --git a/src/SMAPI/Framework/Events/ManagedEventBase.cs b/src/SMAPI/Framework/Events/ManagedEventBase.cs
index 7e42d613..f3a278dc 100644
--- a/src/SMAPI/Framework/Events/ManagedEventBase.cs
+++ b/src/SMAPI/Framework/Events/ManagedEventBase.cs
@@ -17,7 +17,7 @@ namespace StardewModdingAPI.Framework.Events
         private readonly IMonitor Monitor;
 
         /// <summary>The mod registry with which to identify mods.</summary>
-        private readonly ModRegistry ModRegistry;
+        protected readonly ModRegistry ModRegistry;
 
         /// <summary>The display names for the mods which added each delegate.</summary>
         private readonly IDictionary<TEventHandler, IModMetadata> SourceMods = new Dictionary<TEventHandler, IModMetadata>();
@@ -50,11 +50,12 @@ namespace StardewModdingAPI.Framework.Events
         }
 
         /// <summary>Track an event handler.</summary>
+        /// <param name="mod">The mod which added the handler.</param>
         /// <param name="handler">The event handler.</param>
         /// <param name="invocationList">The updated event invocation list.</param>
-        protected void AddTracking(TEventHandler handler, IEnumerable<TEventHandler> invocationList)
+        protected void AddTracking(IModMetadata mod, TEventHandler handler, IEnumerable<TEventHandler> invocationList)
         {
-            this.SourceMods[handler] = this.ModRegistry.GetFromStack();
+            this.SourceMods[handler] = mod;
             this.CachedInvocationList = invocationList?.ToArray() ?? new TEventHandler[0];
         }
 
@@ -64,7 +65,7 @@ namespace StardewModdingAPI.Framework.Events
         protected void RemoveTracking(TEventHandler handler, IEnumerable<TEventHandler> invocationList)
         {
             this.CachedInvocationList = invocationList?.ToArray() ?? new TEventHandler[0];
-            if(!this.CachedInvocationList.Contains(handler)) // don't remove if there's still a reference to the removed handler (e.g. it was added twice and removed once)
+            if (!this.CachedInvocationList.Contains(handler)) // don't remove if there's still a reference to the removed handler (e.g. it was added twice and removed once)
                 this.SourceMods.Remove(handler);
         }
 
-- 
cgit