diff --git a/MiraAPI/Events/MiraEventManager.cs b/MiraAPI/Events/MiraEventManager.cs index 8b48de3f..299a4b8d 100644 --- a/MiraAPI/Events/MiraEventManager.cs +++ b/MiraAPI/Events/MiraEventManager.cs @@ -158,11 +158,7 @@ public static class MiraEventManager internal static void RegisterEvents(Type type, IMiraPlugin miraPlugin) { - if (miraPlugin.ForceRegisterEvents) - { - Warning("For optimisation reasons, MiraAPI no longer automatically searches every type for events. Please use RegisterEventsAttribute moving forward."); - } - else if (!type.IsDefined()) + if (!miraPlugin.ForceRegisterEvents && !type.IsDefined()) { return; } diff --git a/MiraAPI/PluginLoading/MiraPluginManager.cs b/MiraAPI/PluginLoading/MiraPluginManager.cs index e3f6ffa3..737ee2eb 100644 --- a/MiraAPI/PluginLoading/MiraPluginManager.cs +++ b/MiraAPI/PluginLoading/MiraPluginManager.cs @@ -140,6 +140,11 @@ public sealed class MiraPluginManager [SuppressMessage("Minor Code Smell", "S3626:Jump statements should not be redundant", Justification = "Code consistency.")] private static void ProcessAssemblyTypes(Assembly assembly, MiraPluginInfo info, BasePlugin basePlugin, IMiraPlugin plugin, List roles, bool isMira) { + if (plugin.ForceRegisterEvents) + { + Warning("For optimisation reasons, MiraAPI no longer automatically searches every type for events. Please use RegisterEventsAttribute moving forward."); + } + foreach (var type in assembly.GetTypes()) { if ((isMira && type.IsAbstract) || type.IsDefined())