Merge branch 'master' of github.com:essentials/Essentials

Conflicts:
	Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
	Essentials/src/com/earth2me/essentials/commands/Commandenchant.java

2 files changed, 9 insertions, 7 deletions

diff --git a/EssentialsSpawn/nbproject/project.properties b/EssentialsSpawn/nbproject/project.properties
index 16c272f09..96f4448ec 100644
--- a/EssentialsSpawn/nbproject/project.properties
+++ b/EssentialsSpawn/nbproject/project.properties
@@ -79,8 +79,7 @@ javac.target=1.6
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${libs.junit_4.classpath}
+    ${libs.junit_4.10.classpath}
 javac.test.processorpath=\
     ${javac.test.classpath}
 javadoc.additionalparam=
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
index 8ffdb5c97..256faf6c7 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
+++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
@@ -21,15 +21,18 @@ public class EssentialsSpawn extends JavaPlugin
 	{
 		final PluginManager pluginManager = getServer().getPluginManager();
 		ess = (IEssentials)pluginManager.getPlugin("Essentials");
-		final EssentialsSpawnPlayerListener playerListener = new EssentialsSpawnPlayerListener(ess);
-		pluginManager.registerEvent(Type.PLAYER_RESPAWN, playerListener, Priority.Low, this);
-		pluginManager.registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Low, this);
-
-
 		if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion()))
 		{
 			LOGGER.log(Level.WARNING, _("versionMismatchAll"));
 		}
+		if (!ess.isEnabled()) {
+			this.setEnabled(false);
+			return;
+		}
+		final EssentialsSpawnPlayerListener playerListener = new EssentialsSpawnPlayerListener(ess);
+		pluginManager.registerEvent(Type.PLAYER_RESPAWN, playerListener, Priority.Low, this);
+		pluginManager.registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Low, this);
+
 		LOGGER.info(_("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), "essentials team"));
 	}