mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2025-08-05 03:53:41 +00:00
Revert "Add option to disable jails entirely."
This reverts commit 34f5c19f99
.
This commit is contained in:
parent
1bd1665faa
commit
d08ea5a650
6 changed files with 6 additions and 30 deletions
|
@ -232,11 +232,8 @@ public class Essentials extends JavaPlugin implements IEssentials
|
||||||
pm.registerEvents(worldListener, this);
|
pm.registerEvents(worldListener, this);
|
||||||
|
|
||||||
//TODO: Check if this should be here, and not above before reload()
|
//TODO: Check if this should be here, and not above before reload()
|
||||||
if (settings.isJailsEnabled())
|
|
||||||
{
|
|
||||||
jails = new Jails(this);
|
jails = new Jails(this);
|
||||||
confList.add(jails);
|
confList.add(jails);
|
||||||
}
|
|
||||||
|
|
||||||
pm.registerEvents(tntListener, this);
|
pm.registerEvents(tntListener, this);
|
||||||
|
|
||||||
|
@ -431,17 +428,10 @@ public class Essentials extends JavaPlugin implements IEssentials
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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
|
@Override
|
||||||
public Warps getWarps()
|
public Warps getWarps()
|
||||||
|
|
|
@ -37,7 +37,7 @@ public interface IEssentials extends Plugin
|
||||||
|
|
||||||
BukkitScheduler getScheduler();
|
BukkitScheduler getScheduler();
|
||||||
|
|
||||||
IJails getJails() throws UnsupportedOperationException;
|
IJails getJails();
|
||||||
|
|
||||||
Warps getWarps();
|
Warps getWarps();
|
||||||
|
|
||||||
|
|
|
@ -173,6 +173,4 @@ public interface ISettings extends IConf
|
||||||
long getTeleportInvulnerability();
|
long getTeleportInvulnerability();
|
||||||
|
|
||||||
boolean isTeleportInvulnerability();
|
boolean isTeleportInvulnerability();
|
||||||
|
|
||||||
boolean isJailsEnabled();
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -780,10 +780,4 @@ public class Settings implements ISettings
|
||||||
{
|
{
|
||||||
return teleportInvulnerability;
|
return teleportInvulnerability;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isJailsEnabled()
|
|
||||||
{
|
|
||||||
return config.getBoolean("enable-jails", true);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -171,9 +171,6 @@ public class MetricsStarter implements Runnable
|
||||||
|
|
||||||
metrics.start();
|
metrics.start();
|
||||||
|
|
||||||
}
|
|
||||||
catch (UnsupportedOperationException ex)
|
|
||||||
{
|
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
|
|
@ -44,9 +44,6 @@ change-displayname: true
|
||||||
# Don't forget to remove the # infront of the line
|
# Don't forget to remove the # infront of the line
|
||||||
#add-prefix-suffix: false
|
#add-prefix-suffix: false
|
||||||
|
|
||||||
# Whether or not jails are activated
|
|
||||||
enable-jails: true
|
|
||||||
|
|
||||||
# The delay, in seconds, required between /home, /tp, etc.
|
# The delay, in seconds, required between /home, /tp, etc.
|
||||||
teleport-cooldown: 0
|
teleport-cooldown: 0
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue