Merge remote-tracking branch 'origin/master'

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>eu.endermite</groupId>
     <artifactId>CommandWhitelist</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.3</version>
     <packaging>jar</packaging>
 
     <name>CommandWhitelist</name>

src/main/java/eu/endermite/commandwhitelist/listeners/PlayerCommandPreProcess.java

@@ -12,7 +12,7 @@ import java.util.Map;
 
 public class PlayerCommandPreProcess implements Listener {
 
-    @EventHandler(priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.HIGHEST)
     public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandPreprocessEvent event) {
         Player player = event.getPlayer();
 
@@ -26,7 +26,9 @@ public class PlayerCommandPreProcess implements Listener {
             if (player.hasPermission("commandwhitelist.commands." + s.getKey())) {
                 for (String comm : s.getValue()) {
                     comm = comm.toLowerCase();
-                    if (command.startsWith("/" + comm)) {
+                    if (command.equalsIgnoreCase("/"+comm))
+                        return;
+                    else if (command.startsWith("/" + comm + " ")) {
                         return;
                     }
                 }
@@ -34,7 +36,6 @@ public class PlayerCommandPreProcess implements Listener {
         }
         event.setCancelled(true);
         player.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelist.getConfigCache().getPrefix() + " " + CommandWhitelist.getConfigCache().getCommandDenied()));
-
     }
 
 }

src/main/java/eu/endermite/commandwhitelist/listeners/PlayerCommandSend.java

@@ -9,7 +9,7 @@ import java.util.*;
 
 public class PlayerCommandSend implements Listener {
 
-    @EventHandler(priority = EventPriority.HIGH)
+    @EventHandler(priority = EventPriority.HIGHEST)
     public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandSendEvent event) {
         Player player = event.getPlayer();