From 5c32c66390b306aafba119bce44b401da71a1528 Mon Sep 17 00:00:00 2001 From: Steven Lawson Date: Sun, 18 Aug 2013 16:45:35 -0400 Subject: [PATCH] Finish getting rid of old command blocker. --- appinfo.properties | 6 +++--- buildnumber.properties | 4 ++-- .../TotalFreedomMod/Listener/TFM_PlayerListener.java | 2 +- .../TotalFreedomMod/Listener/TFM_ServerListener.java | 8 ++++---- ...TFM_CommandBlockerNew.java => TFM_CommandBlocker.java} | 8 ++++---- src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) rename src/me/StevenLawson/TotalFreedomMod/{TFM_CommandBlockerNew.java => TFM_CommandBlocker.java} (97%) diff --git a/appinfo.properties b/appinfo.properties index a214b7ad..dcab4cdf 100644 --- a/appinfo.properties +++ b/appinfo.properties @@ -1,5 +1,5 @@ -#Wed, 14 Aug 2013 15:57:37 +0200 +#Sun, 18 Aug 2013 16:44:40 -0400 program.VERSION=3.00 -program.BUILDNUM=459 -program.BUILDDATE=08/14/2013 03\:57 PM +program.BUILDNUM=461 +program.BUILDDATE=08/18/2013 04\:44 PM diff --git a/buildnumber.properties b/buildnumber.properties index 2bb73b74..8fda936b 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Wed Aug 14 15:57:37 CEST 2013 -build.number=460 +#Sun Aug 18 16:44:40 EDT 2013 +build.number=462 diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index 766284f8..bcb20f08 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -550,7 +550,7 @@ public class TFM_PlayerListener implements Listener command = command.toLowerCase().trim(); // Blocked commands - if (TFM_CommandBlockerNew.getInstance().isCommandBlocked(command, event.getPlayer())) + if (TFM_CommandBlocker.getInstance().isCommandBlocked(command, event.getPlayer())) { // CommandBlocker handles messages and broadcasts event.setCancelled(true); diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_ServerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_ServerListener.java index b2f12177..ce809e88 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_ServerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_ServerListener.java @@ -3,7 +3,7 @@ package me.StevenLawson.TotalFreedomMod.Listener; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import me.StevenLawson.TotalFreedomMod.TFM_CommandBlockerNew; +import me.StevenLawson.TotalFreedomMod.TFM_CommandBlocker; import me.StevenLawson.TotalFreedomMod.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface; import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList; @@ -52,7 +52,7 @@ public class TFM_ServerListener implements Listener topLevelCommand = topLevelCommand.toLowerCase().trim(); // We need to make it look like the command is coming from the console, so keep the player's name without the Player instance via dummy: - if (TFM_CommandBlockerNew.getInstance().isCommandBlocked(topLevelCommand, new TFM_ServerListener_DummyCommandSender(player.getName()), false)) + if (TFM_CommandBlocker.getInstance().isCommandBlocked(topLevelCommand, new TFM_ServerListener_DummyCommandSender(player.getName()), false)) { player.sendMessage(ChatColor.GRAY + "That command is blocked."); event.setCancelled(true); @@ -64,7 +64,7 @@ public class TFM_ServerListener implements Listener @EventHandler(priority = EventPriority.NORMAL) public void onRemoteServerCommand(RemoteServerCommandEvent event) { - if (TFM_CommandBlockerNew.getInstance().isCommandBlocked(event.getCommand(), event.getSender())) + if (TFM_CommandBlocker.getInstance().isCommandBlocked(event.getCommand(), event.getSender())) { event.setCommand(""); } @@ -73,7 +73,7 @@ public class TFM_ServerListener implements Listener @EventHandler(priority = EventPriority.NORMAL) public void onServerCommand(ServerCommandEvent event) { - if (TFM_CommandBlockerNew.getInstance().isCommandBlocked(event.getCommand(), event.getSender())) + if (TFM_CommandBlocker.getInstance().isCommandBlocked(event.getCommand(), event.getSender())) { event.setCommand(""); } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlockerNew.java b/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java similarity index 97% rename from src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlockerNew.java rename to src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java index e485f012..00d516ae 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlockerNew.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java @@ -12,11 +12,11 @@ import org.bukkit.command.CommandMap; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class TFM_CommandBlockerNew +public class TFM_CommandBlocker { private Map blockedCommands = new HashMap(); - private TFM_CommandBlockerNew() + private TFM_CommandBlocker() { parseBlockingRules(); } @@ -319,13 +319,13 @@ public class TFM_CommandBlockerNew } } - public static TFM_CommandBlockerNew getInstance() + public static TFM_CommandBlocker getInstance() { return TFM_CommandBlockerNewHolder.INSTANCE; } private static class TFM_CommandBlockerNewHolder { - private static final TFM_CommandBlockerNew INSTANCE = new TFM_CommandBlockerNew(); + private static final TFM_CommandBlocker INSTANCE = new TFM_CommandBlocker(); } } diff --git a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java index 907b4666..f6f1ec28 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java +++ b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java @@ -152,7 +152,7 @@ public class TotalFreedomMod extends JavaPlugin public void run() { TFM_CommandLoader.getInstance().scan(); - TFM_CommandBlockerNew.getInstance().parseBlockingRules(); + TFM_CommandBlocker.getInstance().parseBlockingRules(); } }.runTaskLater(this, 20L); }