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

Add blacklist function to disguise options whitelist

Browse Source
This commit is contained in:
libraryaddict 2019-01-12 16:56:17 +13:00
parent 19f8b5b1e2
commit 788d82a872
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,9 +3,9 @@ package me.libraryaddict.disguise.utilities.parser;
import me.libraryaddict.disguise.DisguiseConfig; import me.libraryaddict.disguise.DisguiseConfig;
import me.libraryaddict.disguise.disguisetypes.*; import me.libraryaddict.disguise.disguisetypes.*;
import me.libraryaddict.disguise.utilities.DisguiseUtilities; import me.libraryaddict.disguise.utilities.DisguiseUtilities;
import me.libraryaddict.disguise.utilities.parser.params.ParamInfo;
import me.libraryaddict.disguise.utilities.translations.LibsMsg; import me.libraryaddict.disguise.utilities.translations.LibsMsg;
import me.libraryaddict.disguise.utilities.translations.TranslateType; import me.libraryaddict.disguise.utilities.translations.TranslateType;
import me.libraryaddict.disguise.utilities.parser.params.ParamInfo;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@ -120,6 +120,26 @@ public class DisguiseParser {
} }
} }
/**
* Returns true if the string is found in the map, or it's not a whitelisted setup
*
* Returns if command user can access the disguise creation permission type
*/
private static boolean hasPermissionOption(HashMap<String, Boolean> disguiseOptions, String string) {
// If no permissions were defined, return true
if (disguiseOptions.isEmpty()) {
return true;
}
// If they were explictly defined, can just return the value
if (disguiseOptions.containsKey(string)) {
return disguiseOptions.get(string);
}
// If there is at least one whitelisted value, then they needed the whitelist to use it
return disguiseOptions.containsValue(true);
}
/** /**
* Returns the disguise if it all parsed correctly. Returns a exception with a complete message if it didn't. The * Returns the disguise if it all parsed correctly. Returns a exception with a complete message if it didn't. The
* commandsender is purely used for checking permissions. Would defeat the purpose otherwise. To reach this * commandsender is purely used for checking permissions. Would defeat the purpose otherwise. To reach this
@ -206,8 +226,8 @@ public class DisguiseParser {
// He needs to give the player name // He needs to give the player name
throw new DisguiseParseException(LibsMsg.PARSE_SUPPLY_PLAYER); throw new DisguiseParseException(LibsMsg.PARSE_SUPPLY_PLAYER);
} else { } else {
if (!disguiseOptions.isEmpty() && (!disguiseOptions.containsKey(args[1].toLowerCase()) || // If they can't use this name, throw error
!disguiseOptions.get(args[1].toLowerCase()))) { if (!hasPermissionOption(disguiseOptions, args[1].toLowerCase())) {
throw new DisguiseParseException(LibsMsg.PARSE_NO_PERM_NAME); throw new DisguiseParseException(LibsMsg.PARSE_NO_PERM_NAME);
} }
@ -258,13 +278,9 @@ public class DisguiseParser {
itemStack = new ItemStack(material); itemStack = new ItemStack(material);
if (!disguiseOptions.isEmpty()) { if (!hasPermissionOption(disguiseOptions, itemStack.getType().name().toLowerCase())) {
String toCheck = "" + itemStack.getType().name(); throw new DisguiseParseException(LibsMsg.PARSE_NO_PERM_PARAM,
itemStack.getType().name(), disguisePerm.toReadable());
if (!disguiseOptions.containsKey(toCheck) || !disguiseOptions.get(toCheck)) {
throw new DisguiseParseException(LibsMsg.PARSE_NO_PERM_PARAM, toCheck,
disguisePerm.toReadable());
}
} }
toSkip++; toSkip++;
@ -286,14 +302,10 @@ public class DisguiseParser {
miscId = Integer.parseInt(args[1]); miscId = Integer.parseInt(args[1]);
toSkip++; toSkip++;
if (!disguiseOptions.isEmpty()) { if (!hasPermissionOption(disguiseOptions, miscId + "")) {
String toCheck = "" + miscId; throw new DisguiseParseException(LibsMsg.PARSE_NO_PERM_PARAM, miscId + "",
if (!disguiseOptions.containsKey(toCheck) || !disguiseOptions.get(toCheck)) {
throw new DisguiseParseException(LibsMsg.PARSE_NO_PERM_PARAM, toCheck,
disguisePerm.toReadable()); disguisePerm.toReadable());
} }
}
if (disguisePerm.getType() == DisguiseType.PAINTING) { if (disguisePerm.getType() == DisguiseType.PAINTING) {
usedOptions.add("setpainting"); usedOptions.add("setpainting");