From a005436510cba72a12dff60724cb856ed69b6674 Mon Sep 17 00:00:00 2001 From: ementalo Date: Fri, 3 Jun 2011 21:03:08 +0000 Subject: [trunk] Protect, move some bits about git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1582 e251c2fe-e539-e718-e476-b85c1f46cddb --- .../com/earth2me/essentials/protect/EssentialsProtect.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'EssentialsProtect') diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java index 8dc8ebd10..b3daf4e0b 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java @@ -10,8 +10,6 @@ import com.earth2me.essentials.protect.data.ProtectedBlockMemory; import com.earth2me.essentials.protect.data.ProtectedBlockMySQL; import com.earth2me.essentials.protect.data.ProtectedBlockSQLite; import java.beans.PropertyVetoException; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.logging.Level; @@ -53,10 +51,10 @@ public class EssentialsProtect extends JavaPlugin implements IConf public void onEnable() { - PluginManager pm = this.getServer().getPluginManager(); + ess = Essentials.getStatic(); ess.getDependancyChecker().checkProtectDependancies(); - + PluginManager pm = this.getServer().getPluginManager(); playerListener = new EssentialsProtectPlayerListener(this); blockListener = new EssentialsProtectBlockListener(this); entityListener = new EssentialsProtectEntityListener(this); @@ -73,12 +71,11 @@ public class EssentialsProtect extends JavaPlugin implements IConf pm.registerEvent(Type.LIGHTNING_STRIKE, weatherListener, Priority.Highest, this); pm.registerEvent(Type.THUNDER_CHANGE, weatherListener, Priority.Highest, this); pm.registerEvent(Type.WEATHER_CHANGE, weatherListener, Priority.Highest, this); - + reloadConfig(); + ess.addReloadListener(this); if (!this.getDescription().getVersion().equals(Essentials.getStatic().getDescription().getVersion())) { - logger.log(Level.WARNING, "Version mismatch! Please update all Essentials jars to the same version."); - reloadConfig(); - Essentials.getStatic().addReloadListener(this); + logger.log(Level.WARNING, Util.i18n("versionMismatchAll")); } logger.info(Util.format("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), Essentials.AUTHORS)); } -- cgit v1.2.3