Updates to protect and geoip

5 files changed, 12 insertions, 14 deletions

diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java b/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java
index b500c3ea3..a47ad5e08 100644
--- a/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java
+++ b/EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java
@@ -102,7 +102,7 @@ public class EssentialsConnect
 				{
 					try
 					{
-						protect.setStorage(new ProtectedBlockSQLite("jdbc:sqlite:" + ess.getDataFolder() + "/EssentialsProtect.db"));
+						protect.setStorage(new ProtectedBlockSQLite("jdbc:sqlite:" + ess.getPlugin().getDataFolder() + "/EssentialsProtect.db"));
 					}
 					catch (PropertyVetoException ex)
 					{
diff --git a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java
index 77bb472c7..d3677dc11 100644
--- a/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java
+++ b/EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java
@@ -1,11 +1,9 @@
 package net.ess3.protect;
 
-import static net.ess3.I18n._;
-import net.ess3.api.IEssentials;
-import com.earth2me.essentials.protect.data.IProtectedBlock;
 import java.util.ArrayList;
 import java.util.List;
-
+import static net.ess3.I18n._;
+import net.ess3.protect.data.IProtectedBlock;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
diff --git a/EssentialsProtect/src/net/ess3/protect/ItemUsePermissions.java b/EssentialsProtect/src/net/ess3/protect/ItemUsePermissions.java
index d9ecf9bc0..e47c54400 100644
--- a/EssentialsProtect/src/net/ess3/protect/ItemUsePermissions.java
+++ b/EssentialsProtect/src/net/ess3/protect/ItemUsePermissions.java
@@ -1,10 +1,10 @@
 package net.ess3.protect;
 
-import net.ess3.api.IPermission;
-import net.ess3.permissions.AbstractSuperpermsPermission;
 import java.util.EnumMap;
 import java.util.Locale;
 import java.util.Map;
+import net.ess3.api.IPermission;
+import net.ess3.permissions.AbstractSuperpermsPermission;
 import org.bukkit.Material;
 import org.bukkit.permissions.PermissionDefault;
 
@@ -32,7 +32,7 @@ public class ItemUsePermissions extends AbstractSuperpermsPermission
 	}
 
 	@Override
-	public String getPermission()
+	public String getPermissionName()
 	{
 		return this.permission;
 	}
diff --git a/EssentialsProtect/src/net/ess3/protect/Permissions.java b/EssentialsProtect/src/net/ess3/protect/Permissions.java
index 37042618b..7a0dd3b7e 100644
--- a/EssentialsProtect/src/net/ess3/protect/Permissions.java
+++ b/EssentialsProtect/src/net/ess3/protect/Permissions.java
@@ -1,8 +1,8 @@
 package net.ess3.protect;
 
+import java.util.Locale;
 import net.ess3.api.IPermission;
 import net.ess3.utils.Util;
-import java.util.Locale;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
@@ -49,13 +49,13 @@ public enum Permissions implements IPermission
 	}
 
 	@Override
-	public String getPermission()
+	public String getPermissionName()
 	{
 		return permission;
 	}
 
 	@Override
-	public Permission getBukkitPermission()
+	public Permission getPermission()
 	{
 		if (bukkitPerm != null)
 		{
@@ -63,7 +63,7 @@ public enum Permissions implements IPermission
 		}
 		else
 		{
-			return Util.registerPermission(getPermission(), getPermissionDefault());
+			return Util.registerPermission(getPermissionName(), getPermissionDefault());
 		}
 	}
 
@@ -76,6 +76,6 @@ public enum Permissions implements IPermission
 	@Override
 	public boolean isAuthorized(final CommandSender sender)
 	{
-		return sender.hasPermission(getBukkitPermission());
+		return sender.hasPermission(getPermission());
 	}
 }
diff --git a/EssentialsProtect/src/net/ess3/protect/ProtectHolder.java b/EssentialsProtect/src/net/ess3/protect/ProtectHolder.java
index 145a5e97e..00d6f256b 100644
--- a/EssentialsProtect/src/net/ess3/protect/ProtectHolder.java
+++ b/EssentialsProtect/src/net/ess3/protect/ProtectHolder.java
@@ -17,7 +17,7 @@ public class ProtectHolder extends AsyncStorageObjectHolder<Protect>
 	@Override
 	public File getStorageFile() throws IOException
 	{
-		return new File(ess.getDataFolder(), "protect.yml");
+		return new File(ess.getPlugin().getDataFolder(), "protect.yml");
 	}
 
 	@Override