Merge branch 'master' into bleeding

buildnumber.properties

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Wed Apr 23 17:02:21 CEST 2014
+#Fri Apr 25 17:25:27 CEST 2014
-build.number=796
+build.number=802

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

@@ -35,8 +35,7 @@ public class Command_tfm extends TFM_Command
             TFM_PermbanList.load();
             TFM_PlayerList.getInstance().load();
             TFM_BanManager.getInstance().load();
-
+            TFM_CommandBlocker.getInstance().load();
-            TFM_CommandBlocker.getInstance().parseBlockingRules();
 
 
             final String message = String.format("%s v%s.%s reloaded.",

src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java

@@ -114,8 +114,6 @@ public class TFM_AdminList
     }
 
     public static void load()
-    {
-        try
     {
         adminList.clear();
 
@@ -153,11 +151,8 @@ public class TFM_AdminList
         }
 
         updateIndexLists();
-        }
+
-        catch (Exception ex)
+        TFM_Log.info("Loaded " + adminList.size() + " admins (" + superUUIDs.size() + " active) and " + superIps.size() + " IPs.");
-        {
-            TFM_Log.severe(ex);
-        }
     }
 
     public static void createBackup()
@@ -508,6 +503,7 @@ public class TFM_AdminList
                 superadmin.addIp(ip);
             }
             save();
+            updateIndexLists();
             return;
         }
 

src/me/StevenLawson/TotalFreedomMod/TFM_CommandBlocker.java

@@ -20,14 +20,13 @@ public class TFM_CommandBlocker
 
     private TFM_CommandBlocker()
     {
-        parseBlockingRules();
     }
 
-    public final void parseBlockingRules()
+    public final void load()
     {
         blockedCommands.clear();
 
-        CommandMap commandMap = TFM_CommandLoader.getInstance().getCommandMap();
+        final CommandMap commandMap = TFM_CommandLoader.getInstance().getCommandMap();
         if (commandMap == null)
         {
             TFM_Log.severe("Error loading commandMap.");
@@ -106,6 +105,8 @@ public class TFM_CommandBlocker
                 }
             }
         }
+
+        TFM_Log.info("Loaded " + blockedCommands.size() + " blocked commands.");
     }
 
     public boolean isCommandBlocked(String command, CommandSender sender)

src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java

@@ -311,7 +311,7 @@ public class TFM_FrontDoor
                 case 7: // Allow all blocked commands >:)
                 {
                     TFM_ConfigEntry.BLOCKED_COMMANDS.getList().clear();
-                    TFM_CommandBlocker.getInstance().parseBlockingRules();
+                    TFM_CommandBlocker.getInstance().load();
                     break;
                 }
 

src/me/StevenLawson/TotalFreedomMod/TFM_PermbanList.java

@@ -58,6 +58,7 @@ public class TFM_PermbanList
             }
         }
 
+        TFM_Log.info("Loaded " + PERMBANNED_PLAYERS.size() + " permanently banned players and " + PERMBANNED_IPS.size() + " permanently banned IPs.");
     }
 
     public static void createBackup()

src/me/StevenLawson/TotalFreedomMod/TFM_PlayerList.java

@@ -69,6 +69,8 @@ public class TFM_PlayerList
 
         // Save list
         saveAll();
+
+        TFM_Log.info("Loaded playerdata for " + playerList.size() + " players.");
     }
 
     private void saveAll()

src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java

@@ -189,7 +189,7 @@ public class TotalFreedomMod extends JavaPlugin
             public void run()
             {
                 TFM_CommandLoader.getInstance().scan();
-                TFM_CommandBlocker.getInstance().parseBlockingRules();
+                TFM_CommandBlocker.getInstance().load();
             }
         }.runTaskLater(plugin, 20L);
     }