circlecloud/MiaoScript
2
2
Fork 0
Code Pull Requests Releases 4 Activity

fix: 修复命令执行相关BUG

Browse Source
This commit is contained in:
coding
2018-05-13 16:13:57 +00:00
parent 3df2625e65
commit 288619ddb7
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/resources/internal/bukkit/command.js
View File

@@ -67,7 +67,8 @@ function on(jsp, name, exec) {
try { try {
return exec.cmd(sender, command, args); return exec.cmd(sender, command, args);
} catch (ex) { } catch (ex) {
console.console('§6玩家 §a%s §6执行 §b%s §6插件 §d%s %s §6命令时发生异常 §4%s'.format(sender.name, jsp.description.name, command, Java.from(args).join(' '), ex)); console.console('§6玩家 §a%s §6执行 §b%s §6插件 §d%s %s §6命令时发生异常 §4%s'
.format(sender.name, jsp.description.name, command, Java.from(args).join(' '), ex));
console.ex(ex); console.ex(ex);
} }
} }
@@ -82,7 +83,8 @@ function on(jsp, name, exec) {
var complate = exec.tab(sender, command, args) || [] var complate = exec.tab(sender, command, args) || []
return Arrays.asList(complate.copyPartialMatches(token, [])); return Arrays.asList(complate.copyPartialMatches(token, []));
} catch (ex) { } catch (ex) {
console.console('§6玩家 §a%s §6执行 §b%s §6插件 §d%s %s §6补全时发生异常 §4%s'.format(sender.name, jsp.description.name, command, Java.from(args).join(' '), ex)); console.console('§6玩家 §a%s §6执行 §b%s §6插件 §d%s %s §6补全时发生异常 §4%s'
.format(sender.name, jsp.description.name, command, Java.from(args).join(' '), ex));
console.ex(ex); console.ex(ex);
} }
} }

15
src/main/resources/internal/sponge/command.js
View File

@@ -31,11 +31,11 @@ var SimpleCommandCallable = function (command) {
this.callable = new CommandCallable({ this.callable = new CommandCallable({
//CommandResult process(CommandSource source, String arguments) throws CommandException; //CommandResult process(CommandSource source, String arguments) throws CommandException;
process: function (src, args) { process: function (src, args) {
return that.cmd(src, that.name, args.split(" ")) ? CommandResult.success() : CommandResult.empty(); return that.cmd(src, that.name, args.length === 0 ? [] : args.split(" ")) ? CommandResult.success() : CommandResult.empty();
}, },
//List<String> getSuggestions(CommandSource source, String arguments, @Nullable Location<World> targetPosition) throws CommandException; //List<String> getSuggestions(CommandSource source, String arguments, @Nullable Location<World> targetPosition) throws CommandException;
getSuggestions: function (src, args, target) { getSuggestions: function (src, args, target) {
return that.tab(src, that.name, args.split(" ")); return that.tab(src, that.name, args.length === 0 ? [] : args.split(" "));
}, },
//boolean testPermission(CommandSource source); //boolean testPermission(CommandSource source);
testPermission: function () { testPermission: function () {
@@ -93,24 +93,25 @@ function on(jsp, name, exec) {
var c = create(jsp, {name: name}); var c = create(jsp, {name: name});
console.debug('插件 %s 设置命令 %s 执行器 ...'.format(jsp.description.name, name)); console.debug('插件 %s 设置命令 %s 执行器 ...'.format(jsp.description.name, name));
if (exec.cmd) { if (exec.cmd) {
c.setExecutor(function (sender, command, args) { c.setExecutor(function execCmd(sender, command, args) {
try { try {
return exec.cmd(sender, command, args); return exec.cmd(sender, command, args);
} catch (ex) { } catch (ex) {
console.log(args) console.console('§6玩家 §a%s §6执行 §b%s §6插件 §d%s %s §6命令时发生异常'
console.console('§6玩家 §a%s §6执行 §b%s §6插件 §d%s %s §6命令时发生异常 §4%s'.format(sender.name, jsp.description.name, command, args, ex)); .format(sender.name, jsp.description.name, command, args.join(' ')));
console.ex(ex); console.ex(ex);
} }
}); });
} }
if (exec.tab) { if (exec.tab) {
c.setTabCompleter(function (sender, command, args) { c.setTabCompleter(function execTab(sender, command, args) {
try { try {
var token = args[args.length - 1]; var token = args[args.length - 1];
var complate = exec.tab(sender, command, args) || [] var complate = exec.tab(sender, command, args) || []
return Arrays.asList(complate.copyPartialMatches(token, [])); return Arrays.asList(complate.copyPartialMatches(token, []));
} catch (ex) { } catch (ex) {
console.console('§6玩家 §a%s §6执行 §b%s §6插件 §d%s %s §6补全时发生异常 §4%s'.format(sender.name, jsp.description.name, command, args, ex)); console.console('§6玩家 §a%s §6执行 §b%s §6插件 §d%s %s §6补全时发生异常'
.format(sender.name, jsp.description.name, command, args.join(' ')));
console.ex(ex); console.ex(ex);
} }
}); });