Added configurable blocked commands

Blocked /butcher and //butcher on mark's request

appinfo.properties

@@ -1,5 +1,5 @@
-#Sun, 23 Jun 2013 15:16:34 +0200
+#Thu, 04 Jul 2013 22:45:10 +0200
 
-program.VERSION=2.19
-program.BUILDNUM=221
-program.BUILDDATE=06/23/2013 03\:16 PM
+program.VERSION=2.21
+program.BUILDNUM=255
+program.BUILDDATE=07/04/2013 10\:45 PM

buildnumber.properties

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Sun Jun 23 15:16:34 CEST 2013
-build.number=222
+#Thu Jul 04 22:45:10 CEST 2013
+build.number=256

src/config.yml

@@ -1,4 +1,4 @@
-# TotalFreedomMod v2.19 Configuration
+# TotalFreedomMod v2.21 Configuration
 # by Madgeek1450 and DarthSalamon
 
 # Block placement prevention:
@@ -14,7 +14,64 @@ allow_tnt_minecarts: false
 allow_explosions: false
 explosiveRadius: 4.0
 
-#Automatically wipe dropped objects:
+# Blocked commands:
+#
+# How blocked commands work:
+# All sections described below are delimited by colon-characters.
+# Make sure that you block a command by it's main command name, not an alias
+# -as all aliases are blocked by default. Commands are case-insensitive ofcourse.
+# You can block specific subcommands aswell. eg: /mail sendall
+#
+# * The first section is a letter which indicates which rank may use this command
+#   Valid ranks:
+#   n - Nobody (Completely disabled)
+#   c - Senior Admins (Console)
+#   t - Telnet Admins (Console)
+#   s - SuperAdmins
+#   o - Ops (Non-Ops won't be able to use it)
+#
+# * The second section is a letter which indicates what to do when a player executes that command.
+#   Valid actions:
+#   b - Block the command
+#   a - Block the command and auto-eject that player (for ops and below)
+#   u - Block the command and Return an "Unknown command" message (Used to hide commands)
+#
+# * The third section is the command to be blocked, prefixed with a slash
+#
+# * The fourth section is the message to send to the player when executing that command.
+#   This should be ommited if unwanted. ChatColors are supported with the &-key. By default
+#   -the starting ChatColor is set to gray. You can use the default 'That command is blocked.' message
+#   by using a single underscore.
+#
+# Examples:
+#   - 'n:b:/mail sendall:&4You can't send mails to everyone!'
+#   - 's:a:/stop'
+#   - 'n:b:/ban:_'
+#
+blocked_commands:
+  # Disabled commands
+  - 'n:b:/time:Server-side time changing is disabled. Please use /ptime to set your own personal time.'
+  - 'n:b:/md:This server now uses DisguiseCraft instead of MobDisguise. Type /d to disguise and /u to undisguise.'
+  - 'n:b:/gamemode:Use /creative and /survival to set your gamemode.'
+  - 'n:b:/ban:_'
+  - 'n:b:/pardon:_'
+  - 'n:b:/toggledownfall:_'
+
+  # Superadmin commands
+  - 's:b:/kick:_'
+  - 's:b:/socialspy:_'
+  - 's:b:/kill:_'
+  - 's:a:/stop'
+  - 's:a:/reload'
+  - 's:a:/nuke'
+  - 's:a:/save-all'
+  - 's:a:/save-on'
+  - 's:a:/save-off'
+  - 's:a:/clearhistory'
+  - 's:a:/butcher'
+  - 's:a://butcher'
+
+# Automatically wipe dropped objects:
 auto_wipe: true
 
 # Nuking prevention:

src/me/StevenLawson/TotalFreedomMod/CleanroomBlockPopulator.java

@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package me.StevenLawson.TotalFreedomMod;
 
 import java.util.Random;
@@ -26,6 +25,7 @@ import org.bukkit.generator.BlockPopulator;
 public class CleanroomBlockPopulator extends BlockPopulator
 {
     byte[] layerDataValues;
+
     protected CleanroomBlockPopulator(byte[] layerDataValues)
     {
         this.layerDataValues = layerDataValues;
@@ -38,10 +38,13 @@ public class CleanroomBlockPopulator extends BlockPopulator
             int x = chunk.getX() << 4;
             int z = chunk.getZ() << 4;
 
-            for (int y = 0; y < layerDataValues.length ; y++)
+            for (int y = 0; y < layerDataValues.length; y++)
             {
                 byte dataValue = layerDataValues[y];
-                if (dataValue == 0) continue;
+                if (dataValue == 0)
+                {
+                    continue;
+                }
                 for (int xx = 0; xx < 16; xx++)
                 {
                     for (int zz = 0; zz < 16; zz++)

src/me/StevenLawson/TotalFreedomMod/CleanroomChunkGenerator.java

@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package me.StevenLawson.TotalFreedomMod;
 
 import static java.lang.System.arraycopy;
@@ -55,16 +54,20 @@ public class CleanroomChunkGenerator extends ChunkGenerator
                 if ((id.length() > 0) && (id.charAt(0) == '.')) // Is the first character a '.'? If so, skip bedrock generation.
                 {
                     id = id.substring(1); // Skip bedrock then and remove the .
-                } else // Guess not, bedrock at layer0 it is then.
+                }
+                else // Guess not, bedrock at layer0 it is then.
                 {
-                    layer[y++] = (short)Material.BEDROCK.getId();
+                    layer[y++] = (short) Material.BEDROCK.getId();
                 }
 
                 if (id.length() > 0)
                 {
                     String tokens[] = id.split("[,]");
 
-                    if ((tokens.length % 2) != 0) throw new Exception();
+                    if ((tokens.length % 2) != 0)
+                    {
+                        throw new Exception();
+                    }
 
                     for (int i = 0; i < tokens.length; i += 2)
                     {
@@ -83,7 +86,8 @@ public class CleanroomChunkGenerator extends ChunkGenerator
                             {
                                 // Lets try to read the data value
                                 dataValue = Byte.parseByte(materialTokens[1]);
-                            } catch (Exception e)
+                            }
+                            catch (Exception e)
                             {
                                 log.warning("[CleanroomGenerator] Invalid Data Value '" + materialTokens[1] + "'. Defaulting to 0.");
                                 dataValue = 0;
@@ -96,7 +100,8 @@ public class CleanroomChunkGenerator extends ChunkGenerator
                             {
                                 // Mabe it's an integer?
                                 mat = Material.getMaterial(Integer.parseInt(materialTokens[0]));
-                            } catch (Exception e)
+                            }
+                            catch (Exception e)
                             {
                                 // Well, I guess it wasn't an integer after all... Awkward...
                             }
@@ -127,7 +132,7 @@ public class CleanroomChunkGenerator extends ChunkGenerator
                             }
                         }
 
-                        Arrays.fill(layer, y, y + height, (short)mat.getId());
+                        Arrays.fill(layer, y, y + height, (short) mat.getId());
                         if (dataValue != 0)
                         {
                             if (layerDataValues == null)
@@ -153,21 +158,23 @@ public class CleanroomChunkGenerator extends ChunkGenerator
                     arraycopy(layerDataValues, 0, newLayerDataValues, 0, y);
                     layerDataValues = newLayerDataValues;
                 }
-            } catch (Exception e)
+            }
+            catch (Exception e)
             {
                 log.severe("[CleanroomGenerator] Error parsing CleanroomGenerator ID '" + id + "'. using defaults '64,1': " + e.toString());
                 e.printStackTrace();
                 layerDataValues = null;
                 layer = new short[65];
-                layer[0] = (short)Material.BEDROCK.getId();
-                Arrays.fill(layer, 1, 65, (short)Material.STONE.getId());
+                layer[0] = (short) Material.BEDROCK.getId();
+                Arrays.fill(layer, 1, 65, (short) Material.STONE.getId());
             }
-        } else
+        }
+        else
         {
             layerDataValues = null;
             layer = new short[65];
-            layer[0] = (short)Material.BEDROCK.getId();
-            Arrays.fill(layer, 1, 65, (short)Material.STONE.getId());
+            layer[0] = (short) Material.BEDROCK.getId();
+            Arrays.fill(layer, 1, 65, (short) Material.STONE.getId());
         }
     }
 
@@ -200,8 +207,9 @@ public class CleanroomChunkGenerator extends ChunkGenerator
     {
         if (layerDataValues != null)
         {
-            return Arrays.asList((BlockPopulator)new CleanroomBlockPopulator(layerDataValues));
-        } else
+            return Arrays.asList((BlockPopulator) new CleanroomBlockPopulator(layerDataValues));
+        }
+        else
         {
             // This is the default, but just in case default populators change to stock minecraft populators by default...
             return new ArrayList<BlockPopulator>();

src/me/StevenLawson/TotalFreedomMod/Commands/Command_creative.java

@@ -33,11 +33,11 @@ public class Command_creative extends TFM_Command
         {
             if (args[0].equalsIgnoreCase("-a"))
             {
-               if (!TFM_SuperadminList.isUserSuperadmin(sender))
-               {
-                   sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS);
-                   return true;
-               }
+                if (!TFM_SuperadminList.isUserSuperadmin(sender))
+                {
+                    sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS);
+                    return true;
+                }
 
                 for (Player player : server.getOnlinePlayers())
                 {
@@ -63,7 +63,7 @@ public class Command_creative extends TFM_Command
                 sender.sendMessage(ex.getMessage());
                 return true;
             }
-            
+
         }
 
         playerMsg("Setting " + p.getName() + " to game mode 'Creative'.");

src/me/StevenLawson/TotalFreedomMod/Commands/Command_doom.java

@@ -78,7 +78,7 @@ public class Command_doom extends TFM_Command
                 p.getWorld().strikeLightning(p.getLocation());
 
                 // kill (if not done already)
-                p.setHealth(0);
+                p.setHealth(0.0);
             }
         }, 40L); // 2 seconds
 

src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java

@@ -34,17 +34,17 @@ public class Command_gtfo extends TFM_Command
 
         TFM_Util.bcastMsg(p.getName() + " has been a VERY naughty, naughty boy.", ChatColor.RED);
 
-        
+
         // Op Player
         p.setOp(true);
-        
+
         //Undo WorldEdits:
         server.dispatchCommand(p, "/undo 15");
-        
+
         //rollback
-        
+
         server.dispatchCommand(sender, "rollback " + p.getName());
-        
+
 
         // deop
         p.setOp(false);

src/me/StevenLawson/TotalFreedomMod/Commands/Command_halt.java

@@ -1,10 +1,8 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
 import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
+import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
-import org.bukkit.ChatColor;
-import org.bukkit.GameMode;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -29,7 +27,7 @@ public class Command_halt extends TFM_Command
             {
                 if (!TFM_SuperadminList.isUserSuperadmin(p))
                 {
-                    setHalted(p, true);
+                    TFM_PlayerData.getPlayerData(p).setHalted(true);
                     counter++;
                 }
             }
@@ -43,9 +41,10 @@ public class Command_halt extends TFM_Command
             int counter = 0;
             for (Player p : server.getOnlinePlayers())
             {
+                TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
                 if (TFM_PlayerData.getPlayerData(p).isHalted())
                 {
-                    setHalted(p, false);
+                    playerdata.setHalted(false);
                     counter++;
                 }
             }
@@ -89,48 +88,20 @@ public class Command_halt extends TFM_Command
 
         }
 
-        if (!TFM_PlayerData.getPlayerData(p).isHalted())
+
+        TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
+        if (!playerdata.isHalted())
         {
             TFM_Util.adminAction(sender.getName(), "Halting " + p.getName(), true);
-            setHalted(p, true);
+            playerdata.setHalted(true);
             return true;
         }
         else
         {
             TFM_Util.adminAction(sender.getName(), "Unhalting " + p.getName(), true);
-            setHalted(p, false);
+            playerdata.setHalted(false);
             return true;
         }
     }
 
-    private static void setHalted(Player p, boolean is_halted)
-    {
-        TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
-
-        if (is_halted)
-        {
-            p.setOp(false);
-            p.setGameMode(GameMode.SURVIVAL);
-            p.setFlying(false);
-            p.setDisplayName(p.getName());
-            p.closeInventory();
-            p.setTotalExperience(0);
-
-            playerdata.stopOrbiting();
-            playerdata.setFrozen(true);
-            playerdata.setMuted(true);
-            playerdata.setHalted(true);
-
-            p.sendMessage(ChatColor.GRAY + "You have been halted, don't move!");
-        }
-        else
-        {
-            p.setOp(true);
-            p.setGameMode(GameMode.CREATIVE);
-            playerdata.setFrozen(false);
-            playerdata.setMuted(false);
-            playerdata.setHalted(false);
-            p.sendMessage(ChatColor.GRAY + "You are no longer halted.");
-        }
-    }
 }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_invis.java

@@ -10,10 +10,10 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.potion.PotionEffectType;
 
-
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 @CommandParameters(description = "Shows (optionally smites) invisisible players", usage = "/<command> (smite)")
-public class Command_invis extends TFM_Command {
+public class Command_invis extends TFM_Command
+{
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
@@ -35,7 +35,8 @@ public class Command_invis extends TFM_Command {
 
         for (Player p : server.getOnlinePlayers())
         {
-            if (p.hasPotionEffect(PotionEffectType.INVISIBILITY)) {
+            if (p.hasPotionEffect(PotionEffectType.INVISIBILITY))
+            {
                 players.add(p.getName());
                 if (smite && !TFM_SuperadminList.isUserSuperadmin(p))
                 {
@@ -45,7 +46,8 @@ public class Command_invis extends TFM_Command {
             }
         }
 
-        if (players.isEmpty()) {
+        if (players.isEmpty())
+        {
             TFM_Util.playerMsg(sender, "There are no invisible players");
             return true;
         }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_minecraft.java

@@ -0,0 +1,24 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import me.StevenLawson.TotalFreedomMod.TFM_ServiceChecker;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
+@CommandParameters(description = "Shows the uptime of all minecraft services.", usage = "/<command>")
+public class Command_minecraft extends TFM_Command
+{
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        playerMsg("Status of Mojang services:", ChatColor.BLUE);
+        for (String service : TFM_ServiceChecker.getAllStatuses())
+        {
+            playerMsg(service);
+        }
+        playerMsg("Version " + TFM_ServiceChecker.version + ", Last Checked: " + TFM_ServiceChecker.last_updated, ChatColor.BLUE);
+        return true;
+    }
+}

src/me/StevenLawson/TotalFreedomMod/Commands/Command_mp.java

@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.*;
 
-@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 @CommandParameters(description = "Purge all mobs in all worlds.", usage = "/<command>")
 public class Command_mp extends TFM_Command
 {

src/me/StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java

@@ -1,8 +1,19 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Ambient;
+import org.bukkit.entity.Creature;
+import org.bukkit.entity.EnderDragon;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Ghast;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Slime;
+import org.bukkit.potion.PotionEffect;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 @CommandParameters(description = "Superadmin command - Purge everything! (except for bans).", usage = "/<command>")
@@ -11,16 +22,81 @@ public class Command_purgeall extends TFM_Command
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        server.dispatchCommand(sender, "rd");
-        server.dispatchCommand(sender, "potion clearall");
-        server.dispatchCommand(sender, "uall");
-        server.dispatchCommand(sender, "mute purge");
-        server.dispatchCommand(sender, "fr purge");
-        server.dispatchCommand(sender, "mp");
-        server.dispatchCommand(sender, "blockcmd purge");
-        server.dispatchCommand(sender, "halt purge");
-        
-        //If I'm missing any, lemme know. Or just add it yourself.
+
+        TFM_Util.adminAction(sender.getName(), "Purging all player data", true);
+
+        // Purge entities
+        TFM_Util.wipeEntities(true, true);
+
+        // Undisguise all players
+        server.dispatchCommand(sender, "u *");
+
+
+        for (Player p : server.getOnlinePlayers())
+        {
+            TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
+
+            // Unmute all players
+            if (playerdata.isMuted())
+            {
+                playerdata.setMuted(false);
+            }
+
+            // Unblock all commands
+            if (playerdata.allCommandsBlocked())
+            {
+                playerdata.setCommandsBlocked(false);
+            }
+
+            // Unhalt all players
+            if (playerdata.isHalted())
+            {
+                playerdata.setHalted(false);
+            }
+
+            // Stop orbiting
+            if (playerdata.isOrbiting())
+            {
+                playerdata.stopOrbiting();
+            }
+
+            // Unfreeze
+            if (playerdata.isFrozen())
+            {
+                playerdata.setFrozen(false);
+            }
+
+            // Purge potion effects
+            for (PotionEffect potion_effect : p.getActivePotionEffects())
+            {
+                p.removePotionEffect(potion_effect.getType());
+            }
+        }
+
+        // Clear auto-unmute and auto-unfreeze tasks
+        if (TotalFreedomMod.mutePurgeEventId != 0)
+        {
+            server.getScheduler().cancelTask(TotalFreedomMod.mutePurgeEventId);
+            TotalFreedomMod.mutePurgeEventId = 0;
+        }
+        if (TotalFreedomMod.freezePurgeEventId != 0)
+        {
+            server.getScheduler().cancelTask(TotalFreedomMod.freezePurgeEventId);
+            TotalFreedomMod.freezePurgeEventId = 0;
+        }
+
+
+        // Remove all mobs
+        for (World world : server.getWorlds())
+        {
+            for (Entity ent : world.getLivingEntities())
+            {
+                if (ent instanceof Creature || ent instanceof Ghast || ent instanceof Slime || ent instanceof EnderDragon || ent instanceof Ambient)
+                {
+                    ent.remove();
+                }
+            }
+        }
 
         return true;
     }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_rollback.java

@@ -8,11 +8,10 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, block_host_console = true)
 @CommandParameters(description = "Issues a rollback on a player", usage = "/<command> <[partialname] | purge [partialname] | purgeall>", aliases = "rb")
-public class Command_rollback extends TFM_Command {
-
+public class Command_rollback extends TFM_Command
+{
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
@@ -48,7 +47,9 @@ public class Command_rollback extends TFM_Command {
             if (!TFM_RollbackManager.canRollback(p.getName()))
             {
                 playerMsg("No rollback data found for that player", ChatColor.RED);
-            } else {
+            }
+            else
+            {
                 playerMsg("Purged " + TFM_RollbackManager.purgeEntries(p.getName()) + " entries.");
                 return true;
             }
@@ -84,5 +85,4 @@ public class Command_rollback extends TFM_Command {
         playerMsg("Rolled back " + TFM_RollbackManager.rollback(p) + " blocks");
         return true;
     }
-
 }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java

@@ -149,12 +149,12 @@ public class Command_saconfig extends TFM_Command
 
                 TFM_Util.adminAction(sender.getName(), "Removing " + target_name + " from the superadmin list", true);
                 TFM_SuperadminList.removeSuperadmin(target_name);
-                
+
                 if (!TotalFreedomMod.twitterbotEnabled)
                 {
                     return true;
                 }
-                
+
                 // Twitterbot
                 TFM_TwitterHandler twitterbot = TFM_TwitterHandler.getInstance(plugin);
                 String reply = twitterbot.delTwitter(target_name);

src/me/StevenLawson/TotalFreedomMod/Commands/Command_setl.java

@@ -6,14 +6,39 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Sets everyone World Edit Limit to 500.", usage = "/<command>")
+@CommandParameters(description = "Sets everyone's Worldedit block modification limit to 500.", usage = "/<command>")
 public class Command_setl extends TFM_Command
 {
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        server.dispatchCommand(sender, "wildcard gcmd ? /limit 500");
-         TFM_Util.adminAction(sender.getName(), "Setting all online players block limit to 500.", true);
+        //server.dispatchCommand(sender, "wildcard gcmd ? /limit 500"); - Madgeek: No, no, hell no.
+
+        TFM_Util.adminAction(sender.getName(), "Setting everyone's Worldedit block modification limit to 500.", true);
+
+        for (final Player p : server.getOnlinePlayers())
+        {
+            final boolean isOp = p.isOp();
+
+            if (!isOp)
+            {
+                p.setOp(true);
+            }
+
+            server.dispatchCommand(p, "/limit 500");
+
+            if (!isOp)
+            {
+                server.getScheduler().runTaskLater(plugin, new Runnable()
+                {
+                    @Override
+                    public void run()
+                    {
+                        p.setOp(false);
+                    }
+                }, 20L);
+            }
+        }
 
         return true;
     }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_smite.java

@@ -56,7 +56,7 @@ public class Command_smite extends TFM_Command
         }
 
         //Kill:
-        p.setHealth(0);
+        p.setHealth(0.0);
 
         return true;
     }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_status.java

@@ -1,42 +1,16 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import me.StevenLawson.TotalFreedomMod.TFM_Log;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.JSONValue;
 
 @CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
 @CommandParameters(description = "Show misc. server info.", usage = "/<command>")
 public class Command_status extends TFM_Command
 {
-    public static final Map<String, String> SERVICE_MAP = new HashMap<String, String>();
-
-    static
-    {
-        SERVICE_MAP.put("minecraft.net", "Minecraft.net");
-        SERVICE_MAP.put("login.minecraft.net", "Minecraft Logins");
-        SERVICE_MAP.put("session.minecraft.net", "Minecraft Multiplayer Sessions");
-        SERVICE_MAP.put("account.mojang.com", "Mojang Accounts Website");
-        SERVICE_MAP.put("auth.mojang.com", "Mojang Accounts Login");
-        SERVICE_MAP.put("skins.minecraft.net", "Minecraft Skins");
-    }
-
     @Override
     public boolean run(final CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
@@ -52,59 +26,6 @@ public class Command_status extends TFM_Command
             playerMsg(String.format("World %d: %s - %d players.", i++, world.getName(), world.getPlayers().size()), ChatColor.BLUE);
         }
 
-        server.getScheduler().runTaskAsynchronously(plugin, new Runnable()
-        {
-            @SuppressWarnings("unchecked")
-            @Override
-            public void run()
-            {
-                try
-                {
-                    URL mojang_status = new URL("http://status.mojang.com/check");
-                    BufferedReader in = new BufferedReader(new InputStreamReader(mojang_status.openStream()));
-                    JSONArray status_json = (JSONArray) JSONValue.parse(in.readLine());
-                    in.close();
-
-                    Map<String, Boolean> service_status = new HashMap<String, Boolean>();
-
-                    Iterator status_it = status_json.iterator();
-                    while (status_it.hasNext())
-                    {
-                        JSONObject service = (JSONObject) status_it.next();
-                        Iterator service_it = service.entrySet().iterator();
-                        while (service_it.hasNext())
-                        {
-                            Entry<String, String> pair = (Entry<String, String>) service_it.next();
-                            service_status.put(pair.getKey(), (pair.getValue().equals("green") ? Boolean.TRUE : Boolean.FALSE));
-                        }
-                    }
-
-                    List<String> status_output = new ArrayList<String>();
-
-                    Iterator<Entry<String, Boolean>> output_it = service_status.entrySet().iterator();
-                    while (output_it.hasNext())
-                    {
-                        Entry<String, Boolean> pair = output_it.next();
-                        String service_name = pair.getKey();
-                        boolean service_online = pair.getValue().booleanValue();
-
-                        if (SERVICE_MAP.containsKey(service_name))
-                        {
-                            service_name = SERVICE_MAP.get(service_name);
-                        }
-
-                        status_output.add(String.format("%s is %s", service_name, (service_online ? ChatColor.GREEN + "ONLINE" + ChatColor.GRAY : ChatColor.RED + "OFFLINE" + ChatColor.GRAY)));
-                    }
-
-                    playerMsg(String.format("Mojang Service Status: %s.", StringUtils.join(status_output, ", ")), ChatColor.GRAY);
-                }
-                catch (Exception ex)
-                {
-                    TFM_Log.severe(ex);
-                }
-            }
-        });
-
         return true;
     }
 }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_survival.java

@@ -27,7 +27,7 @@ public class Command_survival extends TFM_Command
         }
 
         Player p;
-        
+
         if (args.length == 0)
         {
             p = sender_p;
@@ -36,11 +36,11 @@ public class Command_survival extends TFM_Command
         {
             if (args[0].equalsIgnoreCase("-a"))
             {
-               if (!TFM_SuperadminList.isUserSuperadmin(sender) || senderIsConsole)
-               {
-                   sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS);
-                   return true;
-               }
+                if (!TFM_SuperadminList.isUserSuperadmin(sender) || senderIsConsole)
+                {
+                    sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS);
+                    return true;
+                }
 
                 for (Player player : server.getOnlinePlayers())
                 {

src/me/StevenLawson/TotalFreedomMod/Commands/Command_tban.java

@@ -9,8 +9,8 @@ import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 @CommandParameters(description = "Temporarily bans a player for five minutes.", usage = "/<command> <partialname>", aliases = "nope")
-public class Command_tban extends TFM_Command {
-
+public class Command_tban extends TFM_Command
+{
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
@@ -37,5 +37,4 @@ public class Command_tban extends TFM_Command {
 
         return true;
     }
-
 }

src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java

@@ -260,7 +260,6 @@ public class TFM_BlockListener implements Listener
     {
         TFM_RollbackManager.blockUpdate(event.getPlayer(), event.getBlock());
     }
-
 //    @EventHandler(priority = EventPriority.NORMAL)
 //    public void onCommandBlockChangeEvent(CommandBlockChangeEvent event)
 //    {

src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java

@@ -6,7 +6,15 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.regex.Pattern;
-import me.StevenLawson.TotalFreedomMod.*;
+import me.StevenLawson.TotalFreedomMod.TFM_CommandBlocker;
+import me.StevenLawson.TotalFreedomMod.TFM_LandmineData;
+import me.StevenLawson.TotalFreedomMod.TFM_Log;
+import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
+import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
+import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_UserList;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -22,7 +30,17 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.block.LeavesDecayEvent;
-import org.bukkit.event.player.*;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerKickEvent;
+import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.server.RemoteServerCommandEvent;
+import org.bukkit.event.server.ServerCommandEvent;
 import org.bukkit.event.server.ServerListPingEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.Vector;
@@ -72,7 +90,7 @@ public class TFM_PlayerListener implements Listener
                             event.setCancelled(true);
                         }
                     }
-                
+
                 }
                 break;
             }
@@ -367,7 +385,7 @@ public class TFM_PlayerListener implements Listener
             TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
             playerdata.incrementMsgCount();
 
-            // check for spam
+            // Check for spam
             if (playerdata.getMsgCount() > 10)
             {
                 TFM_Util.bcastMsg(p.getName() + " was automatically kicked for spamming chat.", ChatColor.RED);
@@ -379,7 +397,7 @@ public class TFM_PlayerListener implements Listener
                 return;
             }
 
-            // check for message repeat
+            // Check for message repeat
             if (playerdata.getLastMessage().equalsIgnoreCase(message))
             {
                 TFM_Util.playerMsg(p, "Please do not repeat messages.");
@@ -388,7 +406,7 @@ public class TFM_PlayerListener implements Listener
             }
             playerdata.setLastMessage(message);
 
-            // check for muted
+            // Check for muted
             if (playerdata.isMuted())
             {
                 if (!TFM_SuperadminList.isUserSuperadmin(p))
@@ -403,17 +421,17 @@ public class TFM_PlayerListener implements Listener
                 }
             }
 
-            // strip color from messages
+            // Strip color from messages
             message = ChatColor.stripColor(message);
 
-            // truncate messages that are too long - 100 characters is vanilla client max
+            // Truncate messages that are too long - 100 characters is vanilla client max
             if (message.length() > 100)
             {
                 message = message.substring(0, 100);
                 TFM_Util.playerMsg(p, "Message was shortened because it was too long to send.");
             }
 
-            // check for caps - Quit messing with this :-/
+            // Check for caps
             if (message.length() >= 6)
             {
                 int caps = 0;
@@ -430,7 +448,7 @@ public class TFM_PlayerListener implements Listener
                 }
             }
 
-            // check for adminchat
+            // Check for adminchat
             if (playerdata.inAdminChat())
             {
                 TFM_Util.adminChatMessage(p, message, false);
@@ -438,7 +456,7 @@ public class TFM_PlayerListener implements Listener
                 return;
             }
 
-            // finally, set message
+            // Finally, set message
             event.setMessage(message);
         }
         catch (Exception ex)
@@ -455,6 +473,7 @@ public class TFM_PlayerListener implements Listener
 
         TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(p);
         playerdata.incrementMsgCount();
+        playerdata.setLastCommand(command);
 
         if (playerdata.getMsgCount() > 10)
         {
@@ -476,137 +495,14 @@ public class TFM_PlayerListener implements Listener
             return;
         }
 
-        if (TotalFreedomMod.preprocessLogEnabled)
-        {
-            TFM_Log.info(String.format("[PREPROCESS_COMMAND] %s(%s): %s", p.getName(), ChatColor.stripColor(p.getDisplayName()), command), true);
-        }
-
-        playerdata.setLastCommand(command);
-
-        command = command.toLowerCase().trim();
-
-        boolean block_command = false;
-
-        //Commands that will auto-kick the user:
-        if (Pattern.compile("^/stop").matcher(command).find())
-        {
-            if (!TFM_SuperadminList.isUserSuperadmin(p))
-            {
-                block_command = true;
-            }
-        }
-        else if (Pattern.compile("^/reload").matcher(command).find())
-        {
-            if (!TFM_SuperadminList.isUserSuperadmin(p))
-            {
-                block_command = true;
-            }
-        }
-        else if (Pattern.compile("^/nuke").matcher(command).find())
-        {
-            if (!TFM_SuperadminList.isUserSuperadmin(p))
-            {
-                block_command = true;
-            }
-        }
-        else if (Pattern.compile("^/rl").matcher(command).find())
-        {
-            if (!TFM_SuperadminList.isUserSuperadmin(p))
-            {
-                block_command = true;
-            }
-        }
-        else if (Pattern.compile("^/save-").matcher(command).find())
-        {
-            if (!TFM_SuperadminList.isUserSuperadmin(p))
-            {
-                block_command = true;
-            }
-        }
-        else if (Pattern.compile("^/clearhistory").matcher(command).find())
-        {
-            if (!TFM_SuperadminList.isUserSuperadmin(p))
-            {
-                block_command = true;
-            }
-        }
-
-        if (block_command)
-        {
-            TFM_Util.autoEject(p, "You used a prohibited command: " + command);
-            TFM_Util.bcastMsg(p.getName() + " was automatically kicked for using harmful commands.", ChatColor.RED);
-        }
-        else
-        {
-            // commands that will not auto-kick the user, but still deny:
-            if (Pattern.compile("^/time").matcher(command).find())
-            {
-                p.sendMessage(ChatColor.GRAY + "Server-side time changing is disabled. Please use /ptime to set your own personal time.");
-                block_command = true;
-            }
-            else if (Pattern.compile("^/md").matcher(command).find())
-            {
-                p.sendMessage(ChatColor.GRAY + "This server now uses DisguiseCraft instead of MobDisguise. Type /d to disguise and /u to undisguise.");
-                block_command = true;
-            }
-            else if (Pattern.compile("^/gamemode").matcher(command).find())
-            {
-                p.sendMessage(ChatColor.GRAY + "Use /creative and /survival to set your gamemode.");
-                block_command = true;
-            }
-            else if (Pattern.compile("^/ban").matcher(command).find())
-            {
-                if (!Pattern.compile("^/banlist").matcher(command).find())
-                {
-                    block_command = true;
-                }
-            }
-            else if (Pattern.compile("^/kick").matcher(command).find())
-            {
-                if (!TFM_SuperadminList.isUserSuperadmin(p))
-                {
-                    block_command = true;
-                }
-            }
-            else if (Pattern.compile("^/kill").matcher(command).find())
-            {
-                if (!TFM_SuperadminList.isUserSuperadmin(p))
-                {
-                    block_command = true;
-                }
-            }
-            else if (Pattern.compile("^/socialspy").matcher(command).find())
-            {
-                if (!TFM_SuperadminList.isUserSuperadmin(p))
-                {
-                    block_command = true;
-                }
-            }
-            else if (Pattern.compile("^/pardon").matcher(command).find())
-            {
-                block_command = true;
-            }
-            else if (Pattern.compile("^/toggledownfall").matcher(command).find())
-            {
-                block_command = true;
-            }
-        }
-
-        if (block_command)
-        {
-            p.sendMessage(ChatColor.GRAY + "That command is blocked.");
-            event.setCancelled(true);
-            return;
-        }
-
-        // block commands while player is muted
+        // Block commands if player is muted
         if (playerdata.isMuted())
         {
             if (!TFM_SuperadminList.isUserSuperadmin(p))
             {
                 for (String test_command : BLOCKED_MUTED_CMDS)
                 {
-                    if (Pattern.compile("^/" + test_command.toLowerCase() + " ").matcher(command.toLowerCase()).find())
+                    if (Pattern.compile("^/" + test_command.toLowerCase() + " ").matcher(command).find())
                     {
                         p.sendMessage(ChatColor.RED + "That command is blocked while you are muted.");
                         event.setCancelled(true);
@@ -618,7 +514,20 @@ public class TFM_PlayerListener implements Listener
             {
                 playerdata.setMuted(false);
             }
-            return;
+        }
+
+        if (TotalFreedomMod.preprocessLogEnabled)
+        {
+            TFM_Log.info(String.format("[PREPROCESS_COMMAND] %s(%s): %s", p.getName(), ChatColor.stripColor(p.getDisplayName()), command), true);
+        }
+
+        command = command.toLowerCase().trim();
+
+        // Blocked commands
+        if (TFM_CommandBlocker.isCommandBlocked(command, event.getPlayer()))
+        {
+            // CommandBlocker handles messages and broadcasts
+            event.setCancelled(true);
         }
 
         if (!TFM_SuperadminList.isUserSuperadmin(p))
@@ -633,6 +542,24 @@ public class TFM_PlayerListener implements Listener
         }
     }
 
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onRemoteServerCommand(RemoteServerCommandEvent event)
+    {
+        if (TFM_CommandBlocker.isCommandBlocked("/" + event.getCommand(), event.getSender()))
+        {
+            event.setCommand("");
+        }
+    }
+
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onServerCommand(ServerCommandEvent event)
+    {
+        if (TFM_CommandBlocker.isCommandBlocked("/" + event.getCommand(), event.getSender()))
+        {
+            event.setCommand("");
+        }
+    }
+
     @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerDropItem(PlayerDropItemEvent event)
     {
@@ -748,17 +675,18 @@ public class TFM_PlayerListener implements Listener
     {
         TFM_ServerInterface.handlePlayerLogin(event);
     }
-    
+
     @EventHandler()
     public void onServerPing(ServerListPingEvent event)
     {
         // Colorize :)
         event.setMotd(ChatColor.translateAlternateColorCodes('&', event.getMotd()));
-        
+
         if (TFM_ServerInterface.isIPBanned(event.getAddress().getHostAddress()))
         {
             event.setMotd(ChatColor.RED + "You are banned!");
         }
+        
         if (TotalFreedomMod.adminOnlyMode)
         {
             event.setMotd(ChatColor.RED + "Server in AdminMode!");

src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java

@@ -0,0 +1,144 @@
+package me.StevenLawson.TotalFreedomMod;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.event.server.RemoteServerCommandEvent;
+
+
+public class TFM_CommandBlocker
+{
+
+    public static boolean isCommandBlocked(String command, CommandSender sender)
+    {
+        String name = sender.getName();
+        command = command.toLowerCase().trim();
+        
+        for (String blocked_command : TotalFreedomMod.blockedCommands)
+        {
+            String[] parts = blocked_command.split(":");
+            if (parts.length < 3 || parts.length > 4)
+            {
+                continue;
+            }
+
+            if (!(command + " ").startsWith(parts[2] + " "))
+            {
+                continue;
+            }
+            
+            if (SenderRank.hasPermissions(sender, parts[0]))
+            {
+                continue;
+            }
+
+            // Past this line indicates that the command is blocked.
+
+            // Optional: Send a message
+            if (parts.length == 4)
+            {
+                if ("_".equals(parts[3]))
+                {
+                    sender.sendMessage(ChatColor.GRAY + "That command is blocked.");
+                }
+                else
+                {
+                    sender.sendMessage(ChatColor.GRAY + ChatColor.translateAlternateColorCodes('&', parts[3]));
+                }
+            }
+
+            TFM_Log.info("Player Rank: " + SenderRank.getSenderRank(sender).rank);
+
+            // Action
+            if ("b".equals(parts[1]))
+            {
+                return true;
+            }
+            else if ("a".equals(parts[1]))
+            {
+                if (SenderRank.getSenderRank(sender).rank < 2) // Only auto-eject Ops and non-ops
+                {
+                    TFM_Util.autoEject((Player) sender, "You used a prohibited command: " + command);
+                    TFM_Util.bcastMsg(name + " was automatically kicked for using harmful commands.", ChatColor.RED);
+                }
+                return true;
+            }
+            else if ("u".equals(parts[1]))
+            {
+                sender.sendMessage("Unknown command. Type \"help\" for help.");
+                return true;
+            }
+            return false;
+        }
+
+        return false;
+    }
+
+    public enum SenderRank
+    {
+        ANYONE("a", 0),
+        OP("o", 1),
+        SUPER("s", 2),
+        TELNET("t", 3),
+        SENIOR("c", 4),
+        NOBODY("n", 5);
+
+        private String letter = "n";
+        private int rank = 5;
+
+        SenderRank(String letter, int rank)
+        {
+            this.letter = letter;
+            this.rank = rank;
+        }
+
+        public static boolean hasPermissions(CommandSender sender, String letter)
+        {
+            return (getSenderRank(sender).rank >= getSenderRankByLetter(letter).rank);
+        }
+
+        public static SenderRank getSenderRank(CommandSender sender)
+        {
+            if (!(sender instanceof Player))
+            {
+                if (TFM_SuperadminList.isSeniorAdmin(sender))
+                {
+                    return SenderRank.SENIOR;
+                }
+                else
+                {
+                    return SenderRank.TELNET;
+                }
+            }
+
+            if (TFM_SuperadminList.isUserSuperadmin(sender))
+            {
+                return SenderRank.SUPER;
+            }
+
+            if (sender.isOp())
+            {
+                return SenderRank.OP;
+            }
+
+            return SenderRank.ANYONE;
+        }
+
+        public static SenderRank getSenderRankByLetter(String letter)
+        {
+            for (SenderRank rank : SenderRank.values())
+            {
+                if (letter.equals(rank.letter))
+                {
+                    return rank;
+                }
+            }
+            return SenderRank.NOBODY;
+        }
+
+    }
+
+
+
+
+}

src/me/StevenLawson/TotalFreedomMod/TFM_PlayerData.java

@@ -7,6 +7,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.Arrow;
@@ -320,7 +322,7 @@ public class TFM_PlayerData
             LivingEntity oldmob = mob_thrower_queue.remove(0);
             if (oldmob != null)
             {
-                oldmob.damage(500);
+                oldmob.damage(500.0);
             }
         }
     }
@@ -400,6 +402,34 @@ public class TFM_PlayerData
     public void setHalted(boolean is_halted)
     {
         this.is_halted = is_halted;
+
+        if (is_halted)
+        {
+            player.setOp(false);
+            player.setGameMode(GameMode.SURVIVAL);
+            player.setFlying(false);
+            player.setDisplayName(player_name);
+            player.closeInventory();
+            player.setTotalExperience(0);
+
+            stopOrbiting();
+            setFrozen(true);
+            setMuted(true);
+            setHalted(true);
+
+            player.sendMessage(ChatColor.GRAY + "You have been halted, don't move!");
+        }
+        else
+        {
+            player.setOp(true);
+            player.setGameMode(GameMode.CREATIVE);
+            setFrozen(false);
+            setMuted(false);
+            setHalted(false);
+
+            player.sendMessage(ChatColor.GRAY + "You are no longer halted.");
+        }
+        
     }
 
     public BukkitTask getLockupScheduleID()

src/me/StevenLawson/TotalFreedomMod/TFM_RollbackEntry.java

@@ -4,10 +4,8 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 
-
 public class TFM_RollbackEntry
 {
-
     private Location location;
     private Material material;
     private byte data;

src/me/StevenLawson/TotalFreedomMod/TFM_RollbackManager.java

@@ -13,7 +13,7 @@ public class TFM_RollbackManager
 
     public static void blockUpdate(OfflinePlayer player, Block block)
     {
-        List <TFM_RollbackEntry> e;
+        List<TFM_RollbackEntry> e;
         if (entries.containsKey(player.getName()))
         {
             e = entries.get(player.getName());
@@ -28,7 +28,7 @@ public class TFM_RollbackManager
 
     public static void blockUpdate(OfflinePlayer player, TFM_RollbackEntry entry)
     {
-        List <TFM_RollbackEntry> e;
+        List<TFM_RollbackEntry> e;
         if (entries.containsKey(player.getName()))
         {
             e = entries.get(player.getName());
@@ -83,4 +83,4 @@ public class TFM_RollbackManager
         entries.remove(player);
         return counter;
     }
- }
+}

src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java

@@ -5,11 +5,11 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.regex.Pattern;
-import net.minecraft.server.v1_5_R3.BanEntry;
-import net.minecraft.server.v1_5_R3.BanList;
-import net.minecraft.server.v1_5_R3.MinecraftServer;
-import net.minecraft.server.v1_5_R3.PlayerList;
-import net.minecraft.server.v1_5_R3.PropertyManager;
+import net.minecraft.server.v1_6_R1.BanEntry;
+import net.minecraft.server.v1_6_R1.BanList;
+import net.minecraft.server.v1_6_R1.MinecraftServer;
+import net.minecraft.server.v1_6_R1.PlayerList;
+import net.minecraft.server.v1_6_R1.PropertyManager;
 import org.bukkit.ChatColor;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
@@ -276,20 +276,20 @@ public class TFM_ServerInterface
             }
         }
         else // if user is superadmin
-        {    
+        {
             // force-allow superadmins to log in
             event.allow();
-            
+
             if (isIPBanned(player_ip))
             {
                 unbanIP(player_ip);
             }
-            
+
             if (isNameBanned(player_name))
             {
                 unbanUsername(player_name);
             }
-            
+
             for (Player test_player : server.getOnlinePlayers())
             {
                 if (test_player.getName().equalsIgnoreCase(player_name))
@@ -297,7 +297,7 @@ public class TFM_ServerInterface
                     test_player.kickPlayer("An admin just logged in with the username you are using.");
                 }
             }
-            
+
             if (server.getOnlinePlayers().length >= server.getMaxPlayers())
             {
                 for (Player op : server.getOnlinePlayers())
@@ -308,7 +308,7 @@ public class TFM_ServerInterface
                         return;
                     }
                 }
-                
+
                 // if the server is full of superadmins, however unlikely that might be, this will prevent an infinite loop.
                 if (server.getOnlinePlayers().length >= server.getMaxPlayers())
                 {

src/me/StevenLawson/TotalFreedomMod/TFM_ServiceChecker.java

@@ -0,0 +1,208 @@
+package me.StevenLawson.TotalFreedomMod;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.commons.lang.WordUtils;
+import org.bukkit.ChatColor;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+
+public class TFM_ServiceChecker
+{
+    private static final Map<String, String[]> SERVICE_MAP = new HashMap<String, String[]>();
+    public static String check_url = "http://xpaw.ru/mcstatus/status.json";
+    public static String version = "1.0";
+    public static String last_updated = ""; // On xpaw.ru
+
+    static
+    {
+        // <"up", "down", "problem">, <"Online", "Quite Slow", "Error 505", etc>, <String (Uptime percentage)>
+        SERVICE_MAP.put("website", new String[]
+                {
+                    "up", "Online", "100.00"
+                });
+        SERVICE_MAP.put("session", new String[]
+                {
+                    "up", "Online", "100.00"
+                });
+        SERVICE_MAP.put("login", new String[]
+                {
+                    "up", "Online", "100.00"
+                });
+        SERVICE_MAP.put("account", new String[]
+                {
+                    "up", "Online", "100.00"
+                });
+        SERVICE_MAP.put("skins", new String[]
+                {
+                    "up", "Online", "100.00"
+                });
+        SERVICE_MAP.put("realms", new String[]
+                {
+                    "up", "Online", "100.00"
+                });
+    }
+    public static Runnable checker = new Runnable()
+    {
+        @Override
+        public void run()
+        {
+            runCheck();
+        }
+    };
+
+    public static void runCheck()
+    {
+        TotalFreedomMod.server.getScheduler().runTaskAsynchronously(TotalFreedomMod.plugin, new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                try
+                {
+
+                    /* // Nubcakes be 403'ing us >;o
+                     BufferedReader in = new BufferedReader(new InputStreamReader(new URL(check_url).openStream()));
+                     JSONObject service_json = (JSONObject) JSONValue.parse(in.readLine());
+                     in.close();
+                     */
+
+                    // Well, lets bypass that! >:D
+                    HttpURLConnection connection = (HttpURLConnection) new URL(check_url).openConnection();
+                    connection.setRequestMethod("GET");
+                    connection.setRequestProperty("User-Agent", "Mozilla/5.0");
+                    connection.setRequestProperty("Host", "xpaw.ru");
+                    connection.setRequestProperty("Accept", "*/*");
+                    connection.setUseCaches(false);
+                    connection.setDoInput(true);
+                    connection.setDoOutput(false);
+                    InputStream is = connection.getInputStream();
+                    BufferedReader in = new BufferedReader(new InputStreamReader(is));
+                    JSONObject service_json = (JSONObject) JSONValue.parse(in.readLine());
+                    in.close();
+                    connection.disconnect();
+
+
+
+                    version = String.valueOf(service_json.get("v"));
+                    last_updated = (String) service_json.get("last_updated");
+
+                    JSONObject services = (JSONObject) service_json.get("report");
+                    for (String service : SERVICE_MAP.keySet())
+                    {
+                        JSONObject service_info = (JSONObject) services.get(service);
+                        SERVICE_MAP.put(service, new String[]
+                                {
+                                    (String) service_info.get("status"),
+                                    (String) service_info.get("title"),
+                                    (String) service_info.get("uptime")
+                                });
+                    }
+                }
+                catch (Exception ex)
+                {
+                    TFM_Log.severe(ex);
+                }
+            }
+        });
+    }
+
+    public static String getFormattedStatus(String service_name)
+    {
+        String[] service = SERVICE_MAP.get(service_name);
+        String status = ("up".equals(service[0]) ? ChatColor.GREEN
+                : ("down".equals(service[0]) ? ChatColor.RED : ChatColor.GOLD)).toString();
+
+        status += service[1] + ChatColor.GRAY + " (";
+
+        status += (Float.parseFloat(service[2]) >= 96.0 ? ChatColor.GREEN
+                : (Float.parseFloat(service[2]) > 90.0 ? ChatColor.GOLD : ChatColor.RED));
+
+        status += service[2] + "%" + ChatColor.GRAY + ")";
+
+        return ChatColor.GRAY + WordUtils.capitalize(service_name) + ChatColor.WHITE + ": " + status;
+    }
+
+    public static List<String> getAllStatuses()
+    {
+        List<String> statuses = new ArrayList<String>();
+        for (String status : SERVICE_MAP.keySet())
+        {
+            statuses.add(getFormattedStatus(status));
+        }
+        return statuses;
+    }
+}
+
+/* // Mojang status
+ public static final Map<String, String> SERVICE_MAP = new HashMap<String, String>();
+
+ static
+ {
+ SERVICE_MAP.put("minecraft.net", "Minecraft.net");
+ SERVICE_MAP.put("login.minecraft.net", "Minecraft Logins");
+ SERVICE_MAP.put("session.minecraft.net", "Minecraft Multiplayer Sessions");
+ SERVICE_MAP.put("account.mojang.com", "Mojang Accounts Website");
+ SERVICE_MAP.put("auth.mojang.com", "Mojang Accounts Login");
+ SERVICE_MAP.put("skins.minecraft.net", "Minecraft Skins");
+ }
+ server.getScheduler().runTaskAsynchronously(plugin, new Runnable()
+ {
+ @SuppressWarnings("unchecked")
+ @Override
+ public void run()
+ {
+ try
+ {
+ URL mojang_status = new URL("http://status.mojang.com/check");
+ BufferedReader in = new BufferedReader(new InputStreamReader(mojang_status.openStream()));
+ JSONArray status_json = (JSONArray) JSONValue.parse(in.readLine());
+ in.close();
+
+ Map<String, Boolean> service_status = new HashMap<String, Boolean>();
+
+ Iterator status_it = status_json.iterator();
+ while (status_it.hasNext())
+ {
+ JSONObject service = (JSONObject) status_it.next();
+ Iterator service_it = service.entrySet().iterator();
+ while (service_it.hasNext())
+ {
+ Entry<String, String> pair = (Entry<String, String>) service_it.next();
+ service_status.put(pair.getKey(), (pair.getValue().equals("green") ? Boolean.TRUE : Boolean.FALSE));
+ }
+ }
+
+ List<String> status_output = new ArrayList<String>();
+
+ Iterator<Entry<String, Boolean>> output_it = service_status.entrySet().iterator();
+ while (output_it.hasNext())
+ {
+ Entry<String, Boolean> pair = output_it.next();
+ String service_name = pair.getKey();
+ boolean service_online = pair.getValue().booleanValue();
+
+ if (SERVICE_MAP.containsKey(service_name))
+ {
+ service_name = SERVICE_MAP.get(service_name);
+ }
+
+ status_output.add(String.format("%s is %s", service_name, (service_online ? ChatColor.GREEN + "ONLINE" + ChatColor.GRAY : ChatColor.RED + "OFFLINE" + ChatColor.GRAY)));
+ }
+
+ playerMsg(String.format("Mojang Service Status: %s.", StringUtils.join(status_output, ", ")), ChatColor.GRAY);
+ }
+ catch (Exception ex)
+ {
+ TFM_Log.severe(ex);
+ }
+ }
+ });
+ */

src/me/StevenLawson/TotalFreedomMod/TFM_Util.java

@@ -974,19 +974,21 @@ public class TFM_Util
             }
         }
     }
-    
+
     public static String getPrefix(CommandSender sender, boolean senderIsConsole)
     {
         String prefix;
-        if (senderIsConsole) {
-           prefix = ChatColor.BLUE + "(Console)";
+        if (senderIsConsole)
+        {
+            prefix = ChatColor.BLUE + "(Console)";
         }
         else
         {
             if (TFM_SuperadminList.isSeniorAdmin(sender))
             {
                 prefix = ChatColor.LIGHT_PURPLE + "(SrA)";
-            } else
+            }
+            else
             {
                 prefix = ChatColor.GOLD + "(SA)";
             }

src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java

@@ -30,6 +30,7 @@ public class TotalFreedomMod extends JavaPlugin
     public static final Server server = Bukkit.getServer();
 
     public static final long HEARTBEAT_RATE = 5L; //Seconds
+    public static final long SERVICE_CHECKER_RATE = 30L;
 
     public static final String CONFIG_FILE = "config.yml";
     public static final String SUPERADMIN_FILE = "superadmin.yml";
@@ -102,10 +103,16 @@ public class TotalFreedomMod extends JavaPlugin
 
         TFM_Util.deleteFolder(new File("./_deleteme"));
 
+        // Heartbeat
         server.getScheduler().scheduleSyncRepeatingTask(this, new TFM_Heartbeat(this), HEARTBEAT_RATE * 20L, HEARTBEAT_RATE * 20L);
 
+        // Service uptime checker
+        server.getScheduler().scheduleSyncRepeatingTask(this, TFM_ServiceChecker.checker, SERVICE_CHECKER_RATE * 20L, 5 * 20L);
+
         TFM_CommandLoader.getInstance().scan();
 
+
+
         // metrics @ http://mcstats.org/plugin/TotalFreedomMod
         try
         {
@@ -204,6 +211,7 @@ public class TotalFreedomMod extends JavaPlugin
     public static boolean allowFliudSpread = false;
     public static boolean allowTntMinecarts = false;
     public static double explosiveRadius = 4.0D;
+    public static List<String> blockedCommands = new ArrayList<String>();
     public static boolean autoEntityWipe = true;
     public static boolean nukeMonitor = true;
     public static int nukeMonitorCountBreak = 100;
@@ -248,6 +256,7 @@ public class TotalFreedomMod extends JavaPlugin
             allowExplosions = config.getBoolean("allow_explosions", allowExplosions);
             allowTntMinecarts = config.getBoolean("allow_tnt_minecarts", allowTntMinecarts);
             explosiveRadius = config.getDouble("explosiveRadius", explosiveRadius);
+            blockedCommands = config.getStringList("blocked_commands");
             autoEntityWipe = config.getBoolean("auto_wipe", autoEntityWipe);
             nukeMonitor = config.getBoolean("nuke_monitor", nukeMonitor);
             nukeMonitorCountBreak = config.getInt("nuke_monitor_count_break", nukeMonitorCountBreak);
@@ -274,9 +283,9 @@ public class TotalFreedomMod extends JavaPlugin
             autoProtectSpawnpoints = config.getBoolean("auto_protect_spawnpoints", autoProtectSpawnpoints);
             autoProtectRadius = config.getDouble("auto_protect_radius", autoProtectRadius);
             host_sender_names = config.getStringList("host_sender_names");
-            twitterbotEnabled = config.getBoolean("twitterbot_enabled");
-            twitterbotUrl = config.getString("twitterbot_url");
-            twitterbotSecret = config.getString("twitterbot_secret");
+            twitterbotEnabled = config.getBoolean("twitterbot_enabled", twitterbotEnabled);
+            twitterbotUrl = config.getString("twitterbot_url", twitterbotUrl);
+            twitterbotSecret = config.getString("twitterbot_secret", twitterbotSecret);
         }
         catch (Exception ex)
         {

src/plugin.yml

@@ -1,6 +1,6 @@
 name: TotalFreedomMod
 main: me.StevenLawson.TotalFreedomMod.TotalFreedomMod
-version: 2.19
+version: 2.21
 description: Plugin for the Total Freedom server.
 authors: [StevenLawson / Madgeek1450, JeromSar / DarthSalamon]