From 3fef36e5cdce18c4b93554efd37b535218e12706 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Tue, 3 Nov 2026 17:59:10 -0700 Subject: [PATCH] Added helper method to allow getting events from generics --- MiraAPI/Events/MiraEventManager.cs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index f068e5cf..7618f477 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; +using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Reflection; using MiraAPI.PluginLoading; @@ -194,6 +195,15 @@ public static class MiraEventManager return new MiraEventHandle(type, eventWrapper); } + private static bool TryGetTrackedEventType(Type type, [NotNullWhen(true)] out HashSet? trackedEventTypes) + { + Type typeToCheck = type.IsGenericType + ? type.GetGenericTypeDefinition() + : type; + + return TrackedEventTypes.TryGetValue(typeToCheck, out trackedEventTypes); + } + private static void EventHandlerAdded(Type type, MiraEventWrapper eventWrapper) { if (!loadFinilized) @@ -203,7 +213,7 @@ public static class MiraEventManager return; } - if (!TrackedEventTypes.TryGetValue(type, out var trackedEvents)) + if (!TryGetTrackedEventType(type, out var trackedEvents)) { return; } @@ -246,7 +256,7 @@ public static class MiraEventManager return true; } - if (!TrackedEventTypes.TryGetValue(eventHandle.EventType, out var eventTypes)) + if (!TryGetTrackedEventType(eventHandle.EventType, out var eventTypes)) { return false; } @@ -272,7 +282,7 @@ public static class MiraEventManager foreach (var eventType in EventTypes) { - EventWrappers.TryAdd(eventType, []); + EventWrappers.Add(eventType, []); } } }