From 16999684eb560eadefa8a06e7b3ebef0e49fbe88 Mon Sep 17 00:00:00 2001 From: Az <56699741+AlchlcDvl@users.noreply.github.com> Date: Mon, 16 Nov 2026 01:17:52 -0500 Subject: [PATCH] skip abstract types correctly --- MiraAPI/GameEnd/GameOverManager.cs | 7 +------ MiraAPI/GameModes/CustomGameModeManager.cs | 2 +- .../GameOptions/Attributes/ModdedEnumOptionAttribute.cs | 3 +-- MiraAPI/GameOptions/ModdedOptionsManager.cs | 2 +- MiraAPI/Hud/CustomButtonManager.cs | 2 +- MiraAPI/LocalSettings/LocalSettingsManager.cs | 2 +- MiraAPI/MeetingAbilities/MeetingButtonManager.cs | 4 ++-- MiraAPI/Modifiers/ModifierManager.cs | 2 +- MiraAPI/Roles/CustomRoleManager.cs | 2 +- 9 files changed, 10 insertions(+), 16 deletions(-) diff --git a/MiraAPI/GameEnd/GameOverManager.cs b/MiraAPI/GameEnd/GameOverManager.cs index 668bbdc2..46af8c9c 100644 --- a/MiraAPI/GameEnd/GameOverManager.cs +++ b/MiraAPI/GameEnd/GameOverManager.cs @@ -17,12 +17,7 @@ public static class GameOverManager internal static bool RegisterGameOver(Type type, in MiraPluginManager.RegistrationContext _) { - if (!typeof(CustomGameOver).IsAssignableFrom(type)) - { - return false; - } - - if (type.IsAbstract) + if (type.IsAbstract || !typeof(CustomGameOver).IsAssignableFrom(type)) { return false; } diff --git a/MiraAPI/GameModes/CustomGameModeManager.cs b/MiraAPI/GameModes/CustomGameModeManager.cs index 5cebc594..3c33f04f 100644 --- a/MiraAPI/GameModes/CustomGameModeManager.cs +++ b/MiraAPI/GameModes/CustomGameModeManager.cs @@ -21,7 +21,7 @@ public static class CustomGameModeManager internal static bool RegisterGameMode(Type type, in MiraPluginManager.RegistrationContext context) { - if (!typeof(AbstractGameMode).IsAssignableFrom(type)) + if (type.IsAbstract || !typeof(AbstractGameMode).IsAssignableFrom(type)) { return false; } diff --git a/MiraAPI/GameOptions/Attributes/ModdedEnumOptionAttribute.cs b/MiraAPI/GameOptions/Attributes/ModdedEnumOptionAttribute.cs index d0bc52a0..71c80288 100644 --- a/MiraAPI/GameOptions/Attributes/ModdedEnumOptionAttribute.cs +++ b/MiraAPI/GameOptions/Attributes/ModdedEnumOptionAttribute.cs @@ -58,8 +58,7 @@ public class ModdedEnumOptionAttribute(string? title, Type enumType, string idPr /// public override void SetValue(object value) { - var opt = HolderOption as ModdedEnumOption; - opt?.SetValue((int)value); + (HolderOption as ModdedEnumOption)?.SetValue((int)value); } /// diff --git a/MiraAPI/GameOptions/ModdedOptionsManager.cs b/MiraAPI/GameOptions/ModdedOptionsManager.cs index a0bbe041..bf5921e9 100644 --- a/MiraAPI/GameOptions/ModdedOptionsManager.cs +++ b/MiraAPI/GameOptions/ModdedOptionsManager.cs @@ -73,7 +73,7 @@ public static class ModdedOptionsManager internal static bool RegisterGroup(Type type, in MiraPluginManager.RegistrationContext context) { - if (!type.IsAssignableTo(typeof(AbstractOptionGroup))) + if (type.IsAbstract || !type.IsAssignableTo(typeof(AbstractOptionGroup))) { return false; } diff --git a/MiraAPI/Hud/CustomButtonManager.cs b/MiraAPI/Hud/CustomButtonManager.cs index 751d67c4..3a84fbb2 100644 --- a/MiraAPI/Hud/CustomButtonManager.cs +++ b/MiraAPI/Hud/CustomButtonManager.cs @@ -33,7 +33,7 @@ public static class CustomButtonManager internal static bool RegisterButton(Type type, in MiraPluginManager.RegistrationContext context) { - if (!type.IsAssignableTo(typeof(CustomActionButton)) || Activator.CreateInstance(type) is not CustomActionButton button) + if (type.IsAbstract || !type.IsAssignableTo(typeof(CustomActionButton)) || Activator.CreateInstance(type) is not CustomActionButton button) { return false; } diff --git a/MiraAPI/LocalSettings/LocalSettingsManager.cs b/MiraAPI/LocalSettings/LocalSettingsManager.cs index 0daa822c..e06b41f2 100644 --- a/MiraAPI/LocalSettings/LocalSettingsManager.cs +++ b/MiraAPI/LocalSettings/LocalSettingsManager.cs @@ -19,7 +19,7 @@ public static class LocalSettingsManager internal static bool RegisterLocalTabs(Type type, in MiraPluginManager.RegistrationContext context) { - if (!type.IsAssignableTo(typeof(LocalSettingsTab))) + if (type.IsAbstract || !type.IsAssignableTo(typeof(LocalSettingsTab))) { return false; } diff --git a/MiraAPI/MeetingAbilities/MeetingButtonManager.cs b/MiraAPI/MeetingAbilities/MeetingButtonManager.cs index a1282d91..6b10b159 100644 --- a/MiraAPI/MeetingAbilities/MeetingButtonManager.cs +++ b/MiraAPI/MeetingAbilities/MeetingButtonManager.cs @@ -25,7 +25,7 @@ public static class MeetingButtonManager internal static bool RegisterTargetedMeetingButton(Type type, in MiraPluginManager.RegistrationContext context) { - if (!typeof(TargetedMeetingButton).IsAssignableFrom(type)) + if (type.IsAbstract || !typeof(TargetedMeetingButton).IsAssignableFrom(type)) { return false; } @@ -40,7 +40,7 @@ public static class MeetingButtonManager internal static bool RegisterMeetingButton(Type type, in MiraPluginManager.RegistrationContext context) { - if (!typeof(MeetingActionButton).IsAssignableFrom(type)) + if (type.IsAbstract || !typeof(MeetingActionButton).IsAssignableFrom(type)) { return false; } diff --git a/MiraAPI/Modifiers/ModifierManager.cs b/MiraAPI/Modifiers/ModifierManager.cs index af21bea3..6905354d 100644 --- a/MiraAPI/Modifiers/ModifierManager.cs +++ b/MiraAPI/Modifiers/ModifierManager.cs @@ -69,7 +69,7 @@ public static class ModifierManager internal static bool RegisterModifier(Type type, in MiraPluginManager.RegistrationContext context) { - if (!typeof(BaseModifier).IsAssignableFrom(type)) + if (type.IsAbstract || !typeof(BaseModifier).IsAssignableFrom(type)) { return false; } diff --git a/MiraAPI/Roles/CustomRoleManager.cs b/MiraAPI/Roles/CustomRoleManager.cs index 18d334b4..c234061a 100644 --- a/MiraAPI/Roles/CustomRoleManager.cs +++ b/MiraAPI/Roles/CustomRoleManager.cs @@ -121,7 +121,7 @@ public static class CustomRoleManager internal static bool RegisterRole(Type type, in MiraPluginManager.RegistrationContext context) { - if (!(typeof(RoleBehaviour).IsAssignableFrom(type) && typeof(ICustomRole).IsAssignableFrom(type))) + if (type.IsAbstract || !(typeof(RoleBehaviour).IsAssignableFrom(type) && typeof(ICustomRole).IsAssignableFrom(type))) { return false; }