Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-28 13:45:20 +01:00
Code Issues Projects Releases Wiki Activity

Default the value to true in set/settemp commands if no arg is given. Closes #82

Browse Source
This commit is contained in:
Luck 2016-12-12 16:52:15 +00:00
parent 70aa3964ee
commit 22ccce3208
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionSet.java
View File

@ -46,10 +46,10 @@ import static me.lucko.luckperms.common.commands.SubCommand.getPermissionTabComp
public class PermissionSet extends SharedSubCommand { public class PermissionSet extends SharedSubCommand {
public PermissionSet() { public PermissionSet() {
super("set", "Sets a permission for the object", Permission.USER_PERM_SET, Permission.GROUP_PERM_SET, super("set", "Sets a permission for the object", Permission.USER_PERM_SET, Permission.GROUP_PERM_SET,
Predicates.notInRange(2, 4), Predicates.notInRange(1, 4),
Arg.list( Arg.list(
Arg.create("node", true, "the permission node to set"), Arg.create("node", true, "the permission node to set"),
Arg.create("true|false", true, "the value of the node"), Arg.create("true|false", false, "the value of the node"),
Arg.create("server", false, "the server to add the permission node on"), Arg.create("server", false, "the server to add the permission node on"),
Arg.create("world", false, "the world to add the permission node on") Arg.create("world", false, "the world to add the permission node on")
) )

4
common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionSetTemp.java
View File

@ -47,10 +47,10 @@ import static me.lucko.luckperms.common.commands.SubCommand.getPermissionTabComp
public class PermissionSetTemp extends SharedSubCommand { public class PermissionSetTemp extends SharedSubCommand {
public PermissionSetTemp() { public PermissionSetTemp() {
super("settemp", "Sets a permission for the object temporarily", Permission.USER_PERM_SETTEMP, super("settemp", "Sets a permission for the object temporarily", Permission.USER_PERM_SETTEMP,
Permission.GROUP_PERM_SETTEMP, Predicates.notInRange(3, 5), Permission.GROUP_PERM_SETTEMP, Predicates.notInRange(2, 5),
Arg.list( Arg.list(
Arg.create("node", true, "the permission node to set"), Arg.create("node", true, "the permission node to set"),
Arg.create("true|false", true, "the value of the node"), Arg.create("true|false", false, "the value of the node"),
Arg.create("duration", true, "the duration until the permission node expires"), Arg.create("duration", true, "the duration until the permission node expires"),
Arg.create("server", false, "the server to add the permission node on"), Arg.create("server", false, "the server to add the permission node on"),
Arg.create("world", false, "the world to add the permission node on") Arg.create("world", false, "the world to add the permission node on")

12
common/src/main/java/me/lucko/luckperms/common/commands/utils/ArgumentUtils.java
View File

@ -66,11 +66,15 @@ public class ArgumentUtils {
} }
public static boolean handleBoolean(int index, List<String> args) throws ArgumentException { public static boolean handleBoolean(int index, List<String> args) throws ArgumentException {
String bool = args.get(index); if (index < args.size()) {
if (!bool.equalsIgnoreCase("true") && !bool.equalsIgnoreCase("false")) { String bool = args.get(index);
throw new DetailedUsageException(); if (bool.equalsIgnoreCase("true") || bool.equalsIgnoreCase("false")) {
return Boolean.parseBoolean(bool);
}
} }
return Boolean.parseBoolean(bool);
args.add(index, "true");
return true;
} }
public static String handleServer(int index, List<String> args) throws ArgumentException { public static String handleServer(int index, List<String> args) throws ArgumentException {