-o implies -p in /npc command

This commit is contained in:
fullwall 2020-05-21 18:36:59 +08:00
parent df2c7689fe
commit ef03e224c2

View File

@ -308,9 +308,10 @@ public class NPCCommands {
if (args.hasValueFlag("permissions")) { if (args.hasValueFlag("permissions")) {
perms.addAll(Arrays.asList(args.getFlag("permissions").split(","))); perms.addAll(Arrays.asList(args.getFlag("permissions").split(",")));
} }
int id = commands.addCommand(new NPCCommandBuilder(command, hand).addPerms(perms).player(args.hasFlag('p')) int id = commands.addCommand(
.op(args.hasFlag('o')).cooldown(args.getFlagInteger("cooldown", 0)).n(args.getFlagInteger("n", -1)) new NPCCommandBuilder(command, hand).addPerms(perms).player(args.hasFlag('p') || args.hasFlag('o'))
.delay(args.getFlagInteger("delay", 0))); .op(args.hasFlag('o')).cooldown(args.getFlagInteger("cooldown", 0))
.n(args.getFlagInteger("n", -1)).delay(args.getFlagInteger("delay", 0)));
Messaging.sendTr(sender, Messages.COMMAND_ADDED, command, id); Messaging.sendTr(sender, Messages.COMMAND_ADDED, command, id);
} else if (args.getString(1).equalsIgnoreCase("remove")) { } else if (args.getString(1).equalsIgnoreCase("remove")) {
if (args.argsLength() == 2) if (args.argsLength() == 2)