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

Allow disguise options on all parameters

Browse Source
This commit is contained in:
libraryaddict 2020-01-23 09:42:01 +13:00
parent 7109633a67
commit 7ee65d26b2
No known key found for this signature in database
GPG Key ID: 052E4FBCD257AEA4
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -722,7 +722,7 @@ public class DisguiseParser {
DisguiseParseException { DisguiseParseException {
Method[] methods = ParamInfoManager.getDisguiseWatcherMethods(disguise.getWatcher().getClass()); Method[] methods = ParamInfoManager.getDisguiseWatcherMethods(disguise.getWatcher().getClass());
List<String> list = new ArrayList<>(Arrays.asList(args)); List<String> list = new ArrayList<>(Arrays.asList(args));
HashMap<String, Boolean> disguiseOptions = null; HashMap<String, Boolean> disguiseOptions = getDisguiseOptions(sender, permNode, disguisePerm);
for (int argIndex = 0; argIndex < args.length; argIndex++) { for (int argIndex = 0; argIndex < args.length; argIndex++) {
// This is the method name they provided // This is the method name they provided
@ -787,14 +787,7 @@ public class DisguiseParser {
usedOptions.add(methodToUse.getName().toLowerCase()); usedOptions.add(methodToUse.getName().toLowerCase());
} }
if (methodToUse.getName().equalsIgnoreCase("setpainting") || if (!disguiseOptions.isEmpty()) {
methodToUse.getName().equalsIgnoreCase("setpotionid") ||
methodToUse.getName().equalsIgnoreCase("setitemstack") ||
methodToUse.getName().equalsIgnoreCase("setblock")) {
if (disguiseOptions == null) {
disguiseOptions = getDisguiseOptions(sender, permNode, disguisePerm);
}
String stringValue = ParamInfoManager.toString(valueToSet); String stringValue = ParamInfoManager.toString(valueToSet);
if (!hasPermissionOption(disguiseOptions, stringValue)) { if (!hasPermissionOption(disguiseOptions, stringValue)) {