diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index d08108b6..10cbdfa2 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -36,12 +36,13 @@ public static class MiraEventManager return false; } - if (handlers.Count == 0) + var callableHandlers = handlers.Where(x => x.ConstructedType.IsAssignableTo(type)).ToList(); + if (callableHandlers.Count == 0) { return false; } - eventHandlers = handlers; + eventHandlers = callableHandlers; return true; } @@ -203,7 +204,7 @@ public static class MiraEventManager /// A to use when unregistering the event. private static MiraEventHandle RegisterEventHandler(Type type, Delegate @delegate, int priority) { - var eventWrapper = new MiraEventWrapper(@delegate, priority); + var eventWrapper = new MiraEventWrapper(@delegate, priority, type); EventHandlerAdded(type, eventWrapper); return new MiraEventHandle(type, eventWrapper); } diff --git a/MiraAPI/Events/MiraEventWrapper.cs b/MiraAPI/Events/MiraEventWrapper.cs index 9568d295..58d7a0ba 100644 --- a/MiraAPI/Events/MiraEventWrapper.cs +++ b/MiraAPI/Events/MiraEventWrapper.cs @@ -17,14 +17,18 @@ public class MiraEventWrapper /// public int Priority { get; } + internal Type ConstructedType { get; } + /// /// Initializes a new instance of the class. /// /// The action for the event handler. /// The priority of the handler. - internal MiraEventWrapper(Delegate eventHandler, int priority) + /// The constructed event type. + internal MiraEventWrapper(Delegate eventHandler, int priority, Type type) { EventHandler = eventHandler; Priority = priority; + ConstructedType = type; } }