From b167540ad7ac8fbf1a86544628dc8081c0d668f6 Mon Sep 17 00:00:00 2001 From: JeromSar Date: Mon, 11 May 2015 23:05:21 +0200 Subject: [PATCH] Properly cancel blocked commands --- buildnumber.properties | 4 ++-- .../TotalFreedomMod/Listener/TFM_PlayerListener.java | 3 ++- src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildnumber.properties b/buildnumber.properties index c9f7e503..33367cee 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Mon May 11 22:29:09 CEST 2015 -build.number=1001 +#Mon May 11 22:50:58 CEST 2015 +build.number=1003 diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index c7a5355d..f3d18e88 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -654,7 +654,7 @@ public class TFM_PlayerListener implements Listener } } - @EventHandler(priority = EventPriority.HIGH) + @EventHandler(priority = EventPriority.HIGHEST) public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) { String command = event.getMessage(); @@ -714,6 +714,7 @@ public class TFM_PlayerListener implements Listener { // CommandBlocker handles messages and broadcasts event.setCancelled(true); + event.setMessage(""); } if (!TFM_AdminList.isSuperAdmin(player)) diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java b/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java index 07bb137b..d1655786 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java @@ -157,7 +157,6 @@ public class TFM_CommandBlocker } return true; - } public static enum CommandBlockerRank