YouHaveTrouble/CommandWhitelist
1
0
Fork 0
mirror of https://github.com/YouHaveTrouble/CommandWhitelist.git synced 2026-05-12 06:26:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

default message in the method itself

Browse Source 
so we don't have to check for empty string every time we want to use it
This commit is contained in:
YouHaveTrouble
2021-10-26 14:05:59 +02:00
parent 0cc2633604
commit 87fc3d7da3
3 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/CommandWhitelistBukkit.java
+7 -6
View File
@@ -130,15 +130,16 @@ public class CommandWhitelistBukkit extends JavaPlugin {
} }
/** /**
* @param command command * @return Command denied message. Will use custom if command exists in any group.
* @return custom command denied message
*/ */
public static String getCommandDeniedMessage(String command) { public static String getCommandDeniedMessage(String command) {
String commandDeniedMessage = ""; String commandDeniedMessage = configCache.command_denied;
HashMap<String, CWGroup> groups = configCache.getGroupList(); HashMap<String, CWGroup> groups = configCache.getGroupList();
for (Map.Entry<String, CWGroup> s : groups.entrySet()) { for (CWGroup group : groups.values()) {
if (s.getValue().getCommands().contains(command)) { if (group.getCommands().contains(command)) {
commandDeniedMessage = s.getValue().getCustomCommandDeniedMessage(); if (group.getCommandDeniedMessage() == null) continue;
commandDeniedMessage = group.getCommandDeniedMessage();
break; // get first message we find
} }
} }
return commandDeniedMessage; return commandDeniedMessage;
CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/PlayerCommandPreProcessListener.java
+1 -6
View File
@@ -24,12 +24,7 @@ public class PlayerCommandPreProcessListener implements Listener {
HashSet<String> commands = CommandWhitelistBukkit.getCommands(player); HashSet<String> commands = CommandWhitelistBukkit.getCommands(player);
if (!commands.contains(label)) { if (!commands.contains(label)) {
event.setCancelled(true); event.setCancelled(true);
String customCommandDeniedMessage = CommandWhitelistBukkit.getCommandDeniedMessage(label); audiences.player(player).sendMessage(CWCommand.miniMessage.parse(config.prefix + CommandWhitelistBukkit.getCommandDeniedMessage(label)));
if (!customCommandDeniedMessage.equals("")) {
audiences.player(player).sendMessage(CWCommand.miniMessage.parse(config.prefix + customCommandDeniedMessage));
} else {
audiences.player(player).sendMessage(CWCommand.miniMessage.parse(config.prefix + config.command_denied));
}
return; return;
} }
CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/protocollib/PacketCommandPreProcessListener.java
+1 -7
View File
@@ -41,15 +41,9 @@ public class PacketCommandPreProcessListener {
BukkitAudiences audiences = CommandWhitelistBukkit.getAudiences(); BukkitAudiences audiences = CommandWhitelistBukkit.getAudiences();
if (!commands.contains(label)) { if (!commands.contains(label)) {
event.setCancelled(true); event.setCancelled(true);
String customCommandDeniedMessage = CommandWhitelistBukkit.getCommandDeniedMessage(label); audiences.player(player).sendMessage(CWCommand.miniMessage.parse(config.prefix + CommandWhitelistBukkit.getCommandDeniedMessage(label)));
if (!customCommandDeniedMessage.equals("")) {
audiences.player(player).sendMessage(CWCommand.miniMessage.parse(config.prefix + customCommandDeniedMessage));
} else {
audiences.player(player).sendMessage(CWCommand.miniMessage.parse(config.prefix + config.command_denied));
}
return; return;
} }
HashSet<String> bannedSubCommands = CommandWhitelistBukkit.getSuggestions(player); HashSet<String> bannedSubCommands = CommandWhitelistBukkit.getSuggestions(player);
for (String bannedSubCommand : bannedSubCommands) { for (String bannedSubCommand : bannedSubCommands) {
if (string.toLowerCase().substring(1).startsWith(bannedSubCommand)) { if (string.toLowerCase().substring(1).startsWith(bannedSubCommand)) {