Merge branch 'master' of https://github.com/TotalFreedom/TotalFreedomMod

LICENSE.md

@@ -4,7 +4,7 @@ TotalFreedomMod is primarily derived from the Bukkit and CraftBukkit library and
 We do, however, ask that you comply by several restrictions. These restrictions are in place to make sure that credit is given to the original authors, who remain the maintainers of the plugin and its source code.
 * A un-edited copy of this LICENSE.md shall always be included with this source code.
 * TotalFreedomMod source code and its derivations shall be freely distributable between anyone who chooses to download it.
-* You shall not remove the keywords "Madgeek1450", "StevenLawson", "DarthSalamon" or "jeromsar" from any part of the source code.
+* You shall not remove the keywords "Madgeek1450", "StevenLawson", "DarthSalamon" or "JeromSar" from any part of the source code.
 * Compiled binaries (*.jar's) shall not to be distributed.
   * If you wish to obtain a copy of TotalFreedomMod you must compile the original source code or it's derivations yourself.
   * The primary developers, StevenLawson (Madgeek1450) and Jerom van der Sar (DarthSalamon), may choose to provide official binaries on a discretionary basis.

appinfo.properties

@@ -1,6 +1,6 @@
-#Wed, 10 Jul 2013 23:58:09 +0200
+#Sun, 14 Jul 2013 14:08:44 +0200
 
 program.VERSION=2.21
-program.BUILDNUM=301
-program.BUILDDATE=07/10/2013 11\:58 PM
+program.BUILDNUM=311
+program.BUILDDATE=07/14/2013 02\:08 PM
 

buildnumber.properties

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Wed Jul 10 23:58:09 CEST 2013
-build.number=302
+#Sun Jul 14 14:08:44 CEST 2013
+build.number=312

src/config.yml

@@ -56,18 +56,20 @@ blocked_commands:
   - n:b:/ban:_
   - n:b:/pardon:_
   - n:b:/toggledownfall:_
+  - n:b:/ban-ip:_
+  - n:b:/pardon-ip:_
 
   # Superadmin commands
   - s:b:/kick:_
   - s:b:/socialspy:_
   - s:b:/kill:_
   - s:b:/clearhistory:_
-  - s:a:/stop
-  - s:a:/reload
-  - s:a:/nuke
-  - s:a:/save-all
-  - s:a:/save-on
-  - s:a:/save-off
+  - s:a:/stop:_
+  - s:a:/reload:_
+  - s:a:/nuke:_
+  - s:a:/save-all:_
+  - s:a:/save-on:_
+  - s:a:/save-off:_
 
 # Automatically wipe dropped objects:
 auto_wipe: true

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

@@ -40,11 +40,9 @@ public class Command_status extends TFM_Command
     @Override
     public boolean run(final CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        playerMsg(String.format("Total Freedom Mod v%s.%s, built %s.", TotalFreedomMod.pluginVersion, TotalFreedomMod.buildNumber, TotalFreedomMod.buildDate), ChatColor.GOLD);
-        playerMsg("TotalFreedomMod was created by Madgeek1450 and DarthSalamon.", ChatColor.GOLD);
+        playerMsg("For information about TotalFreedomMod, try /tfm", ChatColor.GREEN); // Temporary
 
         playerMsg("Server is currently running with 'online-mode=" + (server.getOnlineMode() ? "true" : "false") + "'.", ChatColor.YELLOW);
-
         playerMsg("Loaded worlds:", ChatColor.BLUE);
         int i = 0;
         for (World world : server.getWorlds())

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

@@ -0,0 +1,24 @@
+package me.StevenLawson.TotalFreedomMod.Commands;
+
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+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 information about TotalFreedomMod", usage = "/<command>")
+public class Command_tfm extends TFM_Command
+{
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {   
+        playerMsg("TotalFreedomMod for 'TotalFreedom', the original all-op server.", ChatColor.GOLD);
+        playerMsg(String.format("Version " + ChatColor.BLUE + "%s.%s" + ChatColor.BLUE + ", built %s.", TotalFreedomMod.pluginVersion, TotalFreedomMod.buildNumber, TotalFreedomMod.buildDate), ChatColor.GOLD);
+        playerMsg("Created by Madgeek1450 and DarthSalamon.", ChatColor.GOLD);
+        playerMsg("Visit " + ChatColor.AQUA + "http://totalfreedom.me/" + ChatColor.GREEN + " for more information.", ChatColor.DARK_GREEN);
+
+        return true;
+    }
+
+}

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

@@ -139,7 +139,7 @@ public class TFM_CommandLoader
             this.blockHostConsole = blockHostConsole;
             this.description = description;
             this.usage = usage;
-            this.aliases = Arrays.asList(aliases.split(","));
+            this.aliases = ("".equals(aliases) ? new ArrayList<String>() : Arrays.asList(aliases.split(",")));
         }
 
         public List<String> getAliases()

src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java

@@ -126,7 +126,7 @@ public class TotalFreedomMod extends JavaPlugin
     public void onDisable()
     {
         server.getScheduler().cancelTasks(this);
-        TFM_Log.info("Plugin Disabled");
+        TFM_Log.info("Plugin disabled");
     }
 
     @Override
@@ -154,11 +154,6 @@ public class TotalFreedomMod extends JavaPlugin
                         StringUtils.join(args, " ")), true);
             }
 
-            if ("".equals(commandLabel))
-            {
-                return false;
-            }
-
             TFM_Command dispatcher;
             try
             {
@@ -189,7 +184,6 @@ public class TotalFreedomMod extends JavaPlugin
                 TFM_Log.severe("Command Error: " + commandLabel + "\n" + ExceptionUtils.getStackTrace(ex));
             }
 
-            dispatcher = null;
         }
         catch (Throwable ex)
         {