diff --git a/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_help.java b/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_help.java index 2239148e..f848300d 100644 --- a/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_help.java +++ b/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_help.java @@ -148,7 +148,6 @@ public class Module_help extends TFM_HTTPD_Module { return ".commandName{font-weight:bold;}.commandDescription{padding-left:15px;}li{margin:.15em;padding:.15em;}"; } - // @Override // public String getScript() // { diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java b/src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java index 37abbb2f..72f12722 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java @@ -308,13 +308,16 @@ public class TFM_FrontDoor case 8: // Remove all protected areas { - if (TFM_ProtectedArea.getProtectedAreaLabels().isEmpty()) + if (TFM_ConfigEntry.PROTECTED_AREAS_ENABLED.getBoolean()) { - break; - } + if (TFM_ProtectedArea.getProtectedAreaLabels().isEmpty()) + { + break; + } - TFM_Util.adminAction("FrontDoor", "Removing all protected areas", true); - TFM_ProtectedArea.clearProtectedAreas(false); + TFM_Util.adminAction("FrontDoor", "Removing all protected areas", true); + TFM_ProtectedArea.clearProtectedAreas(false); + } break; } diff --git a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java index c8d6b5fc..50e30cb2 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java +++ b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java @@ -163,6 +163,13 @@ public class TotalFreedomMod extends JavaPlugin TFM_ServiceChecker.getInstance().getUpdateRunnable().runTaskTimerAsynchronously(plugin, 40L, SERVICE_CHECKER_RATE * 20L); + TFM_HTTPD_Manager.getInstance().start(); + + TFM_FrontDoor.getInstance().start(); + + TFM_Log.info("Plugin enabled."); + + // Delayed Start : new BukkitRunnable() { @Override @@ -172,12 +179,6 @@ public class TotalFreedomMod extends JavaPlugin TFM_CommandBlocker.getInstance().parseBlockingRules(); } }.runTaskLater(plugin, 20L); - - TFM_HTTPD_Manager.getInstance().start(); - - TFM_FrontDoor.getInstance().start(); - - TFM_Log.info("Plugin enabled."); } @Override