Merge branch 'develop' into stable

1 files changed, 14 insertions, 6 deletions

diff --git a/src/SMAPI/Framework/Events/ManagedEvent.cs b/src/SMAPI/Framework/Events/ManagedEvent.cs
index fa20a079..4b8a770d 100644
--- a/src/SMAPI/Framework/Events/ManagedEvent.cs
+++ b/src/SMAPI/Framework/Events/ManagedEvent.cs
@@ -18,10 +18,10 @@ namespace StardewModdingAPI.Framework.Events
         protected readonly ModRegistry ModRegistry;
 
         /// <summary>The underlying event handlers.</summary>
-        private readonly List<ManagedEventHandler<TEventArgs>> Handlers = new List<ManagedEventHandler<TEventArgs>>();
+        private readonly List<ManagedEventHandler<TEventArgs>> Handlers = new();
 
         /// <summary>A cached snapshot of <see cref="Handlers"/>, or <c>null</c> to rebuild it next raise.</summary>
-        private ManagedEventHandler<TEventArgs>[] CachedHandlers = new ManagedEventHandler<TEventArgs>[0];
+        private ManagedEventHandler<TEventArgs>[]? CachedHandlers = Array.Empty<ManagedEventHandler<TEventArgs>>();
 
         /// <summary>The total number of event handlers registered for this events, regardless of whether they're still registered.</summary>
         private int RegistrationIndex;
@@ -33,10 +33,10 @@ namespace StardewModdingAPI.Framework.Events
         /*********
         ** Accessors
         *********/
-        /// <summary>A human-readable name for the event.</summary>
+        /// <inheritdoc />
         public string EventName { get; }
 
-        /// <summary>Whether the event is typically called at least once per second.</summary>
+        /// <inheritdoc />
         public bool IsPerformanceCritical { get; }
 
 
@@ -98,7 +98,15 @@ namespace StardewModdingAPI.Framework.Events
         /// <summary>Raise the event and notify all handlers.</summary>
         /// <param name="args">The event arguments to pass.</param>
         /// <param name="match">A lambda which returns true if the event should be raised for the given mod.</param>
-        public void Raise(TEventArgs args, Func<IModMetadata, bool> match = null)
+        public void Raise(TEventArgs args, Func<IModMetadata, bool>? match = null)
+        {
+            this.Raise((_, invoke) => invoke(args), match);
+        }
+
+        /// <summary>Raise the event and notify all handlers.</summary>
+        /// <param name="invoke">Invoke an event handler. This receives the mod which registered the handler, and should invoke the callback with the event arguments to pass it.</param>
+        /// <param name="match">A lambda which returns true if the event should be raised for the given mod.</param>
+        public void Raise(Action<IModMetadata, Action<TEventArgs>> invoke, Func<IModMetadata, bool>? match = null)
         {
             // skip if no handlers
             if (this.Handlers.Count == 0)
@@ -128,7 +136,7 @@ namespace StardewModdingAPI.Framework.Events
 
                 try
                 {
-                    handler.Handler.Invoke(null, args);
+                    invoke(handler.SourceMod, args => handler.Handler.Invoke(null, args));
                 }
                 catch (Exception ex)
                 {