Fix startup errors

10 files changed, 32 insertions, 11 deletions

diff --git a/Essentials/src/net/ess3/api/IPlugin.java b/Essentials/src/net/ess3/api/IPlugin.java
index 83565f35e..6316f13f0 100644
--- a/Essentials/src/net/ess3/api/IPlugin.java
+++ b/Essentials/src/net/ess3/api/IPlugin.java
@@ -11,6 +11,8 @@ public interface IPlugin extends Plugin {
 	int scheduleAsyncDelayedTask(final Runnable run);
 
 	int scheduleSyncDelayedTask(final Runnable run);
+	
+	int scheduleAsyncDelayedTask(final Runnable run, final long delay);
 
 	int scheduleSyncDelayedTask(final Runnable run, final long delay);
 
diff --git a/Essentials/src/net/ess3/bukkit/BukkitPlugin.java b/Essentials/src/net/ess3/bukkit/BukkitPlugin.java
index c07f5d974..526b0821b 100644
--- a/Essentials/src/net/ess3/bukkit/BukkitPlugin.java
+++ b/Essentials/src/net/ess3/bukkit/BukkitPlugin.java
@@ -128,6 +128,12 @@ public class BukkitPlugin extends JavaPlugin implements IPlugin
 	{
 		return getServer().getScheduler().scheduleSyncDelayedTask(this, run);
 	}
+	
+	@Override
+	public int scheduleAsyncDelayedTask(final Runnable run, final long delay)
+	{
+		return getServer().getScheduler().scheduleAsyncDelayedTask(this, run, delay);
+	}
 
 	@Override
 	public int scheduleSyncDelayedTask(final Runnable run, final long delay)
diff --git a/Essentials/src/net/ess3/metrics/MetricsListener.java b/Essentials/src/net/ess3/metrics/MetricsListener.java
index 0a6ff6628..f499af028 100644
--- a/Essentials/src/net/ess3/metrics/MetricsListener.java
+++ b/Essentials/src/net/ess3/metrics/MetricsListener.java
@@ -1,6 +1,11 @@
 package net.ess3.metrics;
 
+import java.util.logging.Level;
+import lombok.Cleanup;
 import net.ess3.api.IEssentials;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 import org.bukkit.Server;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -24,14 +29,18 @@ public class MetricsListener implements Listener
 	@EventHandler(priority = EventPriority.MONITOR)
 	public void onPlayerJoin(final PlayerJoinEvent event)
 	{
-		/*final IUser player = ess.getUserMap().getUser(event.getPlayer());
-		if (ess.getSettings().isMetricsEnabled() == false && (player.isAuthorized("essentials.essentials") || player.isAuthorized("bukkit.broadcast.admin")))
+		final IUser player = ess.getUserMap().getUser(event.getPlayer());
+		@Cleanup
+		ISettings settings = ess.getSettings();
+		settings.acquireReadLock();
+		if (settings.getData().getGeneral().getMetricsEnabled() == null && (Permissions.ESSENTIALS.isAuthorized(event.getPlayer()) || event.getPlayer().hasPermission("bukkit.broadcast.admin")))
 		{
 			player.sendMessage("PluginMetrics collects minimal statistic data, starting in about 5 minutes.");
 			player.sendMessage("To opt out, run /essentials opt-out");
 			ess.getLogger().log(Level.INFO, "[Metrics] Admin join - Starting 5 minute opt-out period.");
-			ess.getSettings().setMetricsEnabled(true);
-			ess.getScheduler().scheduleAsyncDelayedTask(ess, starter, 5 * 1200);
-		}*/
+			settings.acquireWriteLock();
+			settings.getData().getGeneral().setMetricsEnabled(true);
+			ess.getPlugin().scheduleAsyncDelayedTask(starter, 5 * 1200);
+		}
 	}
 }
diff --git a/Essentials/src/net/ess3/metrics/MetricsStarter.java b/Essentials/src/net/ess3/metrics/MetricsStarter.java
index b9db53d3f..d93ff1642 100644
--- a/Essentials/src/net/ess3/metrics/MetricsStarter.java
+++ b/Essentials/src/net/ess3/metrics/MetricsStarter.java
@@ -43,11 +43,11 @@ public class MetricsStarter implements Runnable
 			settings.acquireReadLock();
 			if (!metrics.isOptOut())
 			{
-				if (settings.getData().getGeneral().isMetricsEnabled())
+				if (settings.getData().getGeneral().getMetricsEnabled() == true)
 				{
 					start = true;
 				}
-				else
+				else if (settings.getData().getGeneral().getMetricsEnabled() == null)
 				{
 					ess.getLogger().info("This plugin collects minimal statistic data and sends it to http://metrics.essentials3.net.");
 					ess.getLogger().info("You can opt out by running /essentials opt-out");
diff --git a/Essentials/src/net/ess3/permissions/Permissions.java b/Essentials/src/net/ess3/permissions/Permissions.java
index 64aae476d..cbbc22253 100644
--- a/Essentials/src/net/ess3/permissions/Permissions.java
+++ b/Essentials/src/net/ess3/permissions/Permissions.java
@@ -25,6 +25,7 @@ public enum Permissions implements IPermission
 	DELHOME_OTHERS,
 	ECO_LOAN(PermissionDefault.FALSE),
 	ENDERCHEST_OTHERS,
+	ESSENTIALS,
 	EXP_GIVE,
 	EXP_GIVE_OTHERS,
 	EXP_SET,
diff --git a/Essentials/src/net/ess3/settings/General.java b/Essentials/src/net/ess3/settings/General.java
index 606a847e9..91812631f 100644
--- a/Essentials/src/net/ess3/settings/General.java
+++ b/Essentials/src/net/ess3/settings/General.java
@@ -77,5 +77,5 @@ public class General implements StorageObject
 	{
 		return loginAttackDelay * 1000;
 	}
-	public boolean metricsEnabled = true;
+	public Boolean metricsEnabled = null;
 }
diff --git a/Essentials2Compat/src/plugin.yml b/Essentials2Compat/src/plugin.yml
index bc721f650..5610b82a4 100644
--- a/Essentials2Compat/src/plugin.yml
+++ b/Essentials2Compat/src/plugin.yml
@@ -1,5 +1,5 @@
 name: Essentials
-main: net.ess3.Essentials
+main: com.earth2me.essentials.Essentials
 version: 2.9
 website: http://tiny.cc/EssentialsWiki
 description: Compatibility plugin for older plugins
diff --git a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java
index 676539b08..d2a30dbd8 100644
--- a/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java
+++ b/EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java
@@ -167,6 +167,9 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload
 			LOGGER.log(Level.SEVERE, _("geoIpUrlEmpty"));
 			return;
 		}
+		if (!databaseFile.getAbsoluteFile().getParentFile().exists()) {
+			databaseFile.getAbsoluteFile().getParentFile().mkdirs();
+		}
 		InputStream input = null;
 		OutputStream output = null;
 		try
diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java b/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java
index 1c0130863..24e38a8f3 100644
--- a/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java
+++ b/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java
@@ -4,6 +4,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import static net.ess3.I18n._;
 import net.ess3.api.IEssentials;
+import net.ess3.bukkit.BukkitPlugin;
 import org.bukkit.plugin.Plugin;
 
 
@@ -19,7 +20,7 @@ public class EssentialsConnect
 		{
 			LOGGER.log(Level.WARNING, _("versionMismatchAll"));
 		}
-		ess = (IEssentials)essPlugin;
+		ess = ((BukkitPlugin)essPlugin).getEssentials();
 		protect = (IProtect)essProtect;
 		protect.setSettings(new ProtectHolder(ess));
 	}
diff --git a/EssentialsXMPP/pom.xml b/EssentialsXMPP/pom.xml
index 6bb0fd54a..1d2a6fe0a 100644
--- a/EssentialsXMPP/pom.xml
+++ b/EssentialsXMPP/pom.xml
@@ -41,7 +41,6 @@
                   <include>jivesoftware:smack</include>
                 </includes>
               </artifactSet>
-              <minimizeJar>true</minimizeJar>
             </configuration>
           </execution>
         </executions>