diff --git a/Dalamud/Console/ConsoleManager.cs b/Dalamud/Console/ConsoleManager.cs index 445bc3cd1..6600069c2 100644 --- a/Dalamud/Console/ConsoleManager.cs +++ b/Dalamud/Console/ConsoleManager.cs @@ -384,6 +384,9 @@ internal partial class ConsoleManager : IServiceType /// Thrown if the given type cannot be handled by the console system. protected static ArgumentInfo TypeToArgument(Type type, object? defaultValue = null) { + // If the default value is DBNull, we want to treat it as null + defaultValue = defaultValue == DBNull.Value ? null : defaultValue; + if (type == typeof(string)) return new ArgumentInfo(ConsoleArgumentType.String, defaultValue); @@ -462,8 +465,7 @@ internal partial class ConsoleManager : IServiceType /// public override bool Invoke(IEnumerable arguments) { - this.func.DynamicInvoke(arguments.ToArray()); - return true; + return (bool)this.func.DynamicInvoke(arguments.ToArray())!; } }