diff --git a/buildnumber.properties b/buildnumber.properties index 68a0247e..67604969 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Mon Apr 27 00:47:37 CEST 2015 -build.number=993 +#Sun May 10 23:13:43 CEST 2015 +build.number=995 diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index 40f341d8..f075ec1e 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -712,7 +712,7 @@ public class TFM_PlayerListener implements Listener command = command.toLowerCase().trim(); // Blocked commands - if (TFM_CommandBlocker.isCommandBlocked(command, event.getPlayer())) + if (TFM_CommandBlocker.isCommandBlocked(command, event.getPlayer(), true)) { // CommandBlocker handles messages and broadcasts event.setCancelled(true); diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java b/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java index cf0d7058..060456e1 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java @@ -102,7 +102,7 @@ public class TFM_CommandBlocker public static boolean isCommandBlocked(String command, CommandSender sender) { - return isCommandBlocked(command, sender, true); + return isCommandBlocked(command, sender, false); } public static boolean isCommandBlocked(String command, CommandSender sender, boolean doAction) @@ -112,7 +112,7 @@ public class TFM_CommandBlocker return false; } - if (command.contains(":")) + if (command.split(" ")[0].contains(":")) { TFM_Util.playerMsg(sender, "Plugin-specific commands are disabled."); return true;