diff --git a/packages/api/src/plugin.ts b/packages/api/src/plugin.ts index d45457c0..90bf21a9 100644 --- a/packages/api/src/plugin.ts +++ b/packages/api/src/plugin.ts @@ -20,7 +20,7 @@ export namespace plugin { export abstract class PluginManager { abstract scan(folder: string): void abstract build(): void - abstract loadFromFile(file: string, scanner?: plugin.PluginScanner): Plugin + abstract loadFromFile(file: string, ext: any): Plugin abstract load(...args: any[]): void abstract enable(...args: any[]): void abstract disable(...args: any[]): void diff --git a/packages/plugin/src/command.ts b/packages/plugin/src/command.ts index a9808671..0c0f2c90 100644 --- a/packages/plugin/src/command.ts +++ b/packages/plugin/src/command.ts @@ -56,8 +56,9 @@ export class PluginCommandManager { let cmdKey = 'cmd' + subcommand let subcommandexec = pluginInstance[cmdKey] if (!subcommandexec) { - args.shift() subcommandexec = pluginInstance['cmdmain'] + } else { + args.shift() } if (!subcommandexec) { subcommand && pluginInstance.logger.sender(sender, '§4未知的子命令: §c' + subcommand)