SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add permission "themselves" for setName to refer to player command user

Browse Source
This commit is contained in:
libraryaddict 2020-08-09 04:13:13 +12:00
parent 5397210b56
commit 6dd16a545e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParser.java
View File

@ -236,8 +236,7 @@ public class DisguiseParser {
if (!Objects.deepEquals(dObj, object)) { if (!Objects.deepEquals(dObj, object)) {
throw new IllegalStateException(String.format( throw new IllegalStateException(String.format(
"%s has conflicting values in class %s! This means it expected the same value again but " + "%s has conflicting values in class %s! This means it expected the same value again but " +
"received a " + "received a " + "different value on a different disguise! %s is not the same as %s!",
"different value on a different disguise! %s is not the same as %s!",
setMethod.getName(), setMethod.getDeclaringClass().getName(), object, dObj)); setMethod.getName(), setMethod.getDeclaringClass().getName(), object, dObj));
} }
@ -710,8 +709,11 @@ public class DisguiseParser {
} else { } else {
// If they can't use this name, throw error // If they can't use this name, throw error
if (!hasPermissionOption(disguiseOptions, "setname", args[1].toLowerCase())) { if (!hasPermissionOption(disguiseOptions, "setname", args[1].toLowerCase())) {
if (!args[1].equalsIgnoreCase(sender.getName()) ||
!hasPermissionOption(disguiseOptions, "setname", "themselves")) {
throw new DisguiseParseException(LibsMsg.PARSE_NO_PERM_NAME); throw new DisguiseParseException(LibsMsg.PARSE_NO_PERM_NAME);
} }
}
args[1] = args[1].replace("\\_", " "); args[1] = args[1].replace("\\_", " ");