summaryrefslogtreecommitdiffstats
path: root/Essentials/src/net/ess3/Essentials.java
diff options
context:
space:
mode:
Diffstat (limited to 'Essentials/src/net/ess3/Essentials.java')
-rw-r--r--Essentials/src/net/ess3/Essentials.java9
1 files changed, 1 insertions, 8 deletions
diff --git a/Essentials/src/net/ess3/Essentials.java b/Essentials/src/net/ess3/Essentials.java
index 00499a574..9d0f215a3 100644
--- a/Essentials/src/net/ess3/Essentials.java
+++ b/Essentials/src/net/ess3/Essentials.java
@@ -106,11 +106,9 @@ public class Essentials implements IEssentials
logger.log(Level.INFO, I18n._("usingTempFolderForTesting"));
logger.log(Level.INFO, dataFolder.toString());
- //this.initialize(null, server, new PluginDescriptionFile(new FileReader(new File("src" + File.separator + "plugin.yml"))), dataFolder, null, null);
settings = new SettingsHolder(this);
i18n.updateLocale("en");
userMap = new UserMap(this);
- //permissionsHandler = new PermissionsHandler(this);
economy = new Economy(this);
}
@@ -124,15 +122,10 @@ public class Essentials implements IEssentials
execTimer.mark("BukkitCheck");
- //final EssentialsUpgrade upgrade = new EssentialsUpgrade(this);
- //upgrade.beforeSettings();
- //execTimer.mark("Upgrade");
reloadList = new ArrayList<IReload>();
settings = new SettingsHolder(this);
reloadList.add(settings);
execTimer.mark("Settings");
- //upgrade.afterSettings();
- //execTimer.mark("Upgrade2");
i18n.updateLocale(settings.getLocale());
userMap = new UserMap(this);
reloadList.add(userMap);
@@ -158,7 +151,6 @@ public class Essentials implements IEssentials
onReload();
backup = new Backup(this);
- //permissionsHandler = new PermissionsHandler(this);
jails = new Jails(this);
reloadList.add(jails);
@@ -338,6 +330,7 @@ public class Essentials implements IEssentials
return economy;
}
+ @Override
public SpawnsHolder getSpawns()
{
return spawns;