From e08d9e6f4ded1b04753c420ff4499f3b025a6213 Mon Sep 17 00:00:00 2001 From: YouHaveTrouble Date: Sat, 29 Aug 2020 11:40:13 +0200 Subject: [PATCH] improved code quality --- .../listeners/BungeeChatEventListener.java | 60 +++++++++++-------- .../LegacyPlayerTabChatCompleteListener.java | 19 +++--- .../PlayerCommandPreProcessListener.java | 21 +++---- 3 files changed, 53 insertions(+), 47 deletions(-) diff --git a/src/main/java/eu/endermite/commandwhitelist/bungee/listeners/BungeeChatEventListener.java b/src/main/java/eu/endermite/commandwhitelist/bungee/listeners/BungeeChatEventListener.java index 93ca358..d8f2347 100644 --- a/src/main/java/eu/endermite/commandwhitelist/bungee/listeners/BungeeChatEventListener.java +++ b/src/main/java/eu/endermite/commandwhitelist/bungee/listeners/BungeeChatEventListener.java @@ -5,6 +5,7 @@ import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.event.EventHandler; + import java.util.List; import java.util.Map; @@ -13,34 +14,41 @@ public class BungeeChatEventListener implements Listener { @EventHandler public void onChatEvent(net.md_5.bungee.api.event.ChatEvent event) { - if (!event.isCancelled() && event.getSender() instanceof ProxiedPlayer) { - ProxiedPlayer player = (ProxiedPlayer) event.getSender(); - if (event.isProxyCommand()) { - if (player.hasPermission("commandwhitelist.bypass")) { - return; - } - String command = event.getMessage().toLowerCase(); - boolean found = false; - for (Map.Entry> s : CommandWhitelistBungee.getConfigCache().getPermList().entrySet()) { - if (player.hasPermission("commandwhitelist.commands." + s.getKey())) { - for (String comm : s.getValue()) { - comm = comm.toLowerCase(); - if (command.equalsIgnoreCase("/"+comm)) { - found = true; - break; - } - else if (command.startsWith("/" + comm + " ")) { - found = true; - break; - } - } - } - } - if (!found) { - event.setCancelled(true); - player.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelistBungee.getConfigCache().getPrefix() + CommandWhitelistBungee.getConfigCache().getCommandDenied())); + if (event.isCancelled()) + return; + + if (!(event.getSender() instanceof ProxiedPlayer)) + return; + + if (!event.isProxyCommand()) + return; + + ProxiedPlayer player = (ProxiedPlayer) event.getSender(); + + if (player.hasPermission("commandwhitelist.bypass")) { + return; + } + + String command = event.getMessage().toLowerCase(); + boolean found = false; + for (Map.Entry> s : CommandWhitelistBungee.getConfigCache().getPermList().entrySet()) { + if (!player.hasPermission("commandwhitelist.commands." + s.getKey())) + continue; + + for (String comm : s.getValue()) { + comm = comm.toLowerCase(); + if (command.equalsIgnoreCase("/" + comm)) { + found = true; + break; + } else if (command.startsWith("/" + comm + " ")) { + found = true; + break; } } } + if (!found) { + event.setCancelled(true); + player.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelistBungee.getConfigCache().getPrefix() + CommandWhitelistBungee.getConfigCache().getCommandDenied())); + } } } diff --git a/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/LegacyPlayerTabChatCompleteListener.java b/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/LegacyPlayerTabChatCompleteListener.java index b281a5f..89ffc88 100644 --- a/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/LegacyPlayerTabChatCompleteListener.java +++ b/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/LegacyPlayerTabChatCompleteListener.java @@ -59,7 +59,6 @@ public class LegacyPlayerTabChatCompleteListener { packet.getSpecificModifier(String[].class).write(0, toWrite); } catch (Exception ignored) {} - } }); } @@ -78,14 +77,14 @@ public class LegacyPlayerTabChatCompleteListener { System.out.println(command); for (Map.Entry> s : CommandWhitelist.getConfigCache().getPermList().entrySet()) { - if (player.hasPermission("commandwhitelist.commands." + s.getKey())) { - for (String comm : s.getValue()) { - comm = comm.toLowerCase(); - if (command.equalsIgnoreCase("/"+comm)) - return; - else if (command.startsWith("/" + comm + " ")) { - return; - } + if (!player.hasPermission("commandwhitelist.commands." + s.getKey())) + continue; + for (String comm : s.getValue()) { + comm = comm.toLowerCase(); + if (command.equalsIgnoreCase("/" + comm)) + return; + else if (command.startsWith("/" + comm + " ")) { + return; } } } @@ -93,9 +92,7 @@ public class LegacyPlayerTabChatCompleteListener { } catch (Exception e) { e.printStackTrace(); } - } }); } - } diff --git a/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandPreProcessListener.java b/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandPreProcessListener.java index 9728f00..23e3c84 100644 --- a/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandPreProcessListener.java +++ b/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandPreProcessListener.java @@ -6,6 +6,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; + import java.util.List; import java.util.Map; @@ -15,21 +16,21 @@ public class PlayerCommandPreProcessListener implements Listener { public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandPreprocessEvent event) { Player player = event.getPlayer(); - if (player.hasPermission("commandwhitelist.bypass")) { + if (player.hasPermission("commandwhitelist.bypass")) return; - } String command = event.getMessage().toLowerCase(); for (Map.Entry> s : CommandWhitelist.getConfigCache().getPermList().entrySet()) { - if (player.hasPermission("commandwhitelist.commands." + s.getKey())) { - for (String comm : s.getValue()) { - comm = comm.toLowerCase(); - if (command.equalsIgnoreCase("/"+comm)) - return; - else if (command.startsWith("/" + comm + " ")) { - return; - } + if (!player.hasPermission("commandwhitelist.commands." + s.getKey())) + continue; + + for (String comm : s.getValue()) { + comm = comm.toLowerCase(); + if (command.equalsIgnoreCase("/" + comm)) + return; + else if (command.startsWith("/" + comm + " ")) { + return; } } }