improved code quality

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) {
+        if (event.isCancelled())
+            return;
+
+        if (!(event.getSender() instanceof ProxiedPlayer))
+            return;
+
+        if (!event.isProxyCommand())
+            return;
+
         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<String, List<String>> s : CommandWhitelistBungee.getConfigCache().getPermList().entrySet()) {
-                    if (player.hasPermission("commandwhitelist.commands." + s.getKey())) {
+            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 + " ")) {
-                            else if (command.startsWith("/" + comm + " ")) {
                     found = true;
                     break;
                 }
             }
         }
-                }
         if (!found) {
             event.setCancelled(true);
             player.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelistBungee.getConfigCache().getPrefix() + CommandWhitelistBungee.getConfigCache().getCommandDenied()));
         }
     }
 }
-    }
-}

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,7 +77,8 @@ public class LegacyPlayerTabChatCompleteListener {
                     System.out.println(command);
 
                     for (Map.Entry<String, List<String>> s : CommandWhitelist.getConfigCache().getPermList().entrySet()) {
-                        if (player.hasPermission("commandwhitelist.commands." + s.getKey())) {
+                        if (!player.hasPermission("commandwhitelist.commands." + s.getKey()))
+                            continue;
                         for (String comm : s.getValue()) {
                             comm = comm.toLowerCase();
                             if (command.equalsIgnoreCase("/" + comm))
@@ -88,14 +88,11 @@ public class LegacyPlayerTabChatCompleteListener {
                             }
                         }
                     }
-                    }
                     event.setCancelled(true);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-
             }
         });
     }
-
 }

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,14 +16,15 @@ 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<String, List<String>> s : CommandWhitelist.getConfigCache().getPermList().entrySet()) {
-            if (player.hasPermission("commandwhitelist.commands." + s.getKey())) {
+            if (!player.hasPermission("commandwhitelist.commands." + s.getKey()))
+                continue;
+
             for (String comm : s.getValue()) {
                 comm = comm.toLowerCase();
                 if (command.equalsIgnoreCase("/" + comm))
@@ -32,7 +34,6 @@ public class PlayerCommandPreProcessListener implements Listener {
                 }
             }
         }
-        }
         event.setCancelled(true);
         player.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelist.getConfigCache().getPrefix() + CommandWhitelist.getConfigCache().getCommandDenied()));
     }