From c90c447f014855befc31391dfa81c438c937c616 Mon Sep 17 00:00:00 2001
From: KHobbits <rob@khobbits.co.uk>
Date: Sat, 14 Apr 2012 23:18:20 +0100
Subject: Revert "Add option to disable jails entirely." This reverts commit
 58dfc03ab79d513bd4ed91574b21df0b1bbc5763.

---
 Essentials/src/com/earth2me/essentials/Essentials.java | 18 ++++--------------
 .../src/com/earth2me/essentials/IEssentials.java       |  2 +-
 Essentials/src/com/earth2me/essentials/ISettings.java  |  2 --
 Essentials/src/com/earth2me/essentials/Settings.java   |  6 ------
 .../earth2me/essentials/metrics/MetricsStarter.java    |  3 ---
 Essentials/src/config.yml                              |  5 +----
 6 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 8a7643b68..5a82a9fb1 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -232,11 +232,8 @@ public class Essentials extends JavaPlugin implements IEssentials
 		pm.registerEvents(worldListener, this);
 
 		//TODO: Check if this should be here, and not above before reload()
-		if (settings.isJailsEnabled())
-		{
-			jails = new Jails(this);
-			confList.add(jails);
-		}
+		jails = new Jails(this);
+		confList.add(jails);
 
 		pm.registerEvents(tntListener, this);
 
@@ -431,16 +428,9 @@ public class Essentials extends JavaPlugin implements IEssentials
 	}
 
 	@Override
-	public IJails getJails() throws UnsupportedOperationException
+	public IJails getJails()
 	{
-		if (jails == null)
-		{
-			throw new UnsupportedOperationException("Jails are not enabled in your configuration");
-		}
-		else
-		{
-			return jails;
-		}
+		return jails;
 	}
 
 	@Override
diff --git a/Essentials/src/com/earth2me/essentials/IEssentials.java b/Essentials/src/com/earth2me/essentials/IEssentials.java
index 1b38d0dfe..83c2e7325 100644
--- a/Essentials/src/com/earth2me/essentials/IEssentials.java
+++ b/Essentials/src/com/earth2me/essentials/IEssentials.java
@@ -37,7 +37,7 @@ public interface IEssentials extends Plugin
 
 	BukkitScheduler getScheduler();
 
-	IJails getJails() throws UnsupportedOperationException;
+	IJails getJails();
 
 	Warps getWarps();
 
diff --git a/Essentials/src/com/earth2me/essentials/ISettings.java b/Essentials/src/com/earth2me/essentials/ISettings.java
index ea0354602..2c07ccd58 100644
--- a/Essentials/src/com/earth2me/essentials/ISettings.java
+++ b/Essentials/src/com/earth2me/essentials/ISettings.java
@@ -173,6 +173,4 @@ public interface ISettings extends IConf
 	long getTeleportInvulnerability();
 	
 	boolean isTeleportInvulnerability();
-
-	boolean isJailsEnabled();
 }
diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java
index 0e36782be..c4b19601f 100644
--- a/Essentials/src/com/earth2me/essentials/Settings.java
+++ b/Essentials/src/com/earth2me/essentials/Settings.java
@@ -780,10 +780,4 @@ public class Settings implements ISettings
 	{
 		return teleportInvulnerability;
 	}
-
-	@Override
-	public boolean isJailsEnabled()
-	{
-		return config.getBoolean("enable-jails", true);
-	}
 }
diff --git a/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java b/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java
index befed005f..0ea692cc9 100644
--- a/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java
+++ b/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java
@@ -171,9 +171,6 @@ public class MetricsStarter implements Runnable
 
 			metrics.start();
 
-		}
-		catch (UnsupportedOperationException ex)
-		{
 		}
 		catch (Exception ex)
 		{
diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml
index 3227322a8..70433b5b0 100644
--- a/Essentials/src/config.yml
+++ b/Essentials/src/config.yml
@@ -44,9 +44,6 @@ change-displayname: true
 # Don't forget to remove the # infront of the line
 #add-prefix-suffix: false
 
-# Whether or not jails are activated
-enable-jails: true
-
 # The delay, in seconds, required between /home, /tp, etc.
 teleport-cooldown: 0
 
@@ -587,7 +584,7 @@ newbies:
   # When we spawn for the first time, which spawnpoint do we use?
   # Set to "none" if you want to use the spawn point of the world.
   spawnpoint: newbies
-
+  
   # Do we want to give users anything on first join? Set to '' to disable
   # This kit will be given reguardless of cost, and permissions.
   #kit: ''
-- 
cgit v1.2.3