Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-03 01:19:58 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Add option to disable jails entirely."

Browse Source 
This reverts commit 34f5c19f99.
This commit is contained in:
KHobbits 2012-04-14 23:18:20 +01:00
parent 1bd1665faa
commit d08ea5a650
6 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Essentials/src/com/earth2me/essentials/Essentials.java
View File

@ -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

2
Essentials/src/com/earth2me/essentials/IEssentials.java
View File

@ -37,7 +37,7 @@ public interface IEssentials extends Plugin
BukkitScheduler getScheduler();
IJails getJails() throws UnsupportedOperationException;
IJails getJails();
Warps getWarps();

2
Essentials/src/com/earth2me/essentials/ISettings.java
View File

@ -173,6 +173,4 @@ public interface ISettings extends IConf
long getTeleportInvulnerability();
boolean isTeleportInvulnerability();
boolean isJailsEnabled();
}

6
Essentials/src/com/earth2me/essentials/Settings.java
View File

@ -780,10 +780,4 @@ public class Settings implements ISettings
{
return teleportInvulnerability;
}
@Override
public boolean isJailsEnabled()
{
return config.getBoolean("enable-jails", true);
}
}

3
Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java
View File

@ -171,9 +171,6 @@ public class MetricsStarter implements Runnable
metrics.start();
}
catch (UnsupportedOperationException ex)
{
}
catch (Exception ex)
{

3
Essentials/src/config.yml
View File

@ -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