diff --git a/MiraAPI/GameOptions/AbstractOptionGroup.cs b/MiraAPI/GameOptions/AbstractOptionGroup.cs index 589f705e..be370b1d 100644 --- a/MiraAPI/GameOptions/AbstractOptionGroup.cs +++ b/MiraAPI/GameOptions/AbstractOptionGroup.cs @@ -154,9 +154,6 @@ public abstract class AbstractOptionGroup : AbstractOptionGroup public abstract class AbstractRoleOptionGroup : AbstractOptionGroup where T : ICustomRole { - /// - public override Type OptionableType => typeof(T); - /// public override MenuCategory ParentMenu => MenuCategory.Roles; diff --git a/MiraAPI/Utilities/Assets/LoadableAsset.cs b/MiraAPI/Utilities/Assets/LoadableAsset.cs index dea91e71..061cef5d 100644 --- a/MiraAPI/Utilities/Assets/LoadableAsset.cs +++ b/MiraAPI/Utilities/Assets/LoadableAsset.cs @@ -26,9 +26,9 @@ public abstract class LoadableAsset /// Converts the into its by loading the asset. /// /// The to get the asset from. - public static implicit operator T(LoadableAsset loadable) + public static implicit operator T(LoadableAsset? loadable) { - return loadable.LoadAsset(); + return loadable?.LoadAsset()!; } /// diff --git a/MiraAPI/Utilities/StateMachineWrapper.cs b/MiraAPI/Utilities/StateMachineWrapper.cs index 298feb19..120155f3 100644 --- a/MiraAPI/Utilities/StateMachineWrapper.cs +++ b/MiraAPI/Utilities/StateMachineWrapper.cs @@ -96,4 +96,10 @@ public class StateMachineWrapper _propertyCache[parameterName] = property; return (TField)property.GetValue(_stateMachine)!; } + + /// + /// Implicitly converts a state machine wrapper into its instance. + /// + /// The wrapper. + public static implicit operator T(StateMachineWrapper wrapper) => wrapper.Instance; }