From bbd8e1deefb2e6d38355c0cb5f876083629bb331 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Wed, 4 Nov 2026 12:11:29 -0700 Subject: [PATCH] Inverted tracking direction to subtypes for correct EventWrappers contravariance --- MiraAPI/Events/MiraEventManager.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index ec12a059..8d93cad2 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -37,7 +37,7 @@ public static class MiraEventManager return false; } - var callableHandlers = handlers.Where(x => type.IsSubclassOfWithGeneric(x.DefinedType)).ToList(); + var callableHandlers = handlers.Where(x => x.DefinedType.IsSubclassOf(type)).ToList(); if (callableHandlers.Count == 0) { return false; @@ -113,11 +113,11 @@ public static class MiraEventManager AddTypeToTracked(eventType); - TrackedEventTypes[eventType].UnionWith(InternalEventTypes.Where(x => eventType.IsSubclassOfWithGeneric(x))); - - foreach (var subType in InternalEventTypes.Where(x => x.IsSubclassOfWithGeneric(eventType))) + // subtypes are added to their supertypes, regardless of which were added first + TrackedEventTypes[eventType].UnionWith(InternalEventTypes.Where(x => x.IsSubclassOfWithGeneric(eventType))); + foreach (var supertype in InternalEventTypes.Where(x => eventType.IsSubclassOfWithGeneric(x))) { - AddTypeToTracked(subType, eventType); + AddTypeToTracked(supertype, eventType); } info.InternalEventTypes.Add(eventType);