summaryrefslogtreecommitdiffstats
path: root/EssentialsProtect/src
diff options
context:
space:
mode:
authorsnowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-05-11 22:30:34 +0000
committersnowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-05-11 22:30:34 +0000
commit30a5198abbc8a994bfc0a282903ee4c61679bda8 (patch)
treef5872601ad5aff891907be67d7f4a369770fd577 /EssentialsProtect/src
parent6f79a84587ff1f13f4a5e7ae677da6102d52c210 (diff)
downloadEssentials-30a5198abbc8a994bfc0a282903ee4c61679bda8.tar
Essentials-30a5198abbc8a994bfc0a282903ee4c61679bda8.tar.gz
Essentials-30a5198abbc8a994bfc0a282903ee4c61679bda8.tar.lz
Essentials-30a5198abbc8a994bfc0a282903ee4c61679bda8.tar.xz
Essentials-30a5198abbc8a994bfc0a282903ee4c61679bda8.zip
Finally get rid of all dependency problems.
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1423 e251c2fe-e539-e718-e476-b85c1f46cddb
Diffstat (limited to 'EssentialsProtect/src')
-rw-r--r--EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java15
-rw-r--r--EssentialsProtect/src/plugin.yml3
2 files changed, 5 insertions, 13 deletions
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
index e026ffd4f..ceb668d83 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.protect;
import com.earth2me.essentials.Essentials;
-import com.earth2me.essentials.IConfExternal;
+import com.earth2me.essentials.IConf;
import com.earth2me.essentials.User;
import com.earth2me.essentials.Util;
import java.util.ArrayList;
@@ -16,7 +16,7 @@ import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin;
-public class EssentialsProtect extends JavaPlugin
+public class EssentialsProtect extends JavaPlugin implements IConf
{
private EssentialsProtectBlockListener blockListener = null;
private EssentialsProtectPlayerListener playerListener = null;
@@ -43,9 +43,6 @@ public class EssentialsProtect extends JavaPlugin
public void onEnable()
{
PluginManager pm = this.getServer().getPluginManager();
- Essentials ess = (Essentials)pm.getPlugin("Essentials");
- if (!ess.isEnabled())
- pm.enablePlugin(ess);
playerListener = new EssentialsProtectPlayerListener(this);
blockListener = new EssentialsProtectBlockListener(this);
@@ -77,13 +74,7 @@ public class EssentialsProtect extends JavaPlugin
pm.registerEvent(Type.PLUGIN_ENABLE, serverListener, Priority.Highest, this);
reloadConfig();
- Essentials.getStatic().addReloadListener(new IConfExternal() {
-
- public void reloadConfig()
- {
- EssentialsProtect.this.reloadConfig();
- }
- });
+ Essentials.getStatic().addReloadListener(this);
if (!this.getDescription().getVersion().equals(Essentials.getStatic().getDescription().getVersion())) {
logger.log(Level.WARNING, Util.i18n("versionMismatchAll"));
}
diff --git a/EssentialsProtect/src/plugin.yml b/EssentialsProtect/src/plugin.yml
index c8b77dbd9..e5212599d 100644
--- a/EssentialsProtect/src/plugin.yml
+++ b/EssentialsProtect/src/plugin.yml
@@ -5,4 +5,5 @@ main: com.earth2me.essentials.protect.EssentialsProtect
version: TeamCity
website: http://www.earth2me.net:8001/
description: Provides protection for various parts of the world.
-authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology] \ No newline at end of file
+authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
+depend: [Essentials] \ No newline at end of file