minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-13 01:54:25 +02:00
Code Issues Releases Wiki Activity

Updates to protect and geoip

Browse Source
This commit is contained in:
ementalo
2012-08-29 15:11:29 +01:00
parent cc82d2ccc2
commit bbcf3ee352
9 changed files with 54 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java
View File

@@ -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)
{

6
EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java
View File

@@ -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;

6
EssentialsProtect/src/net/ess3/protect/ItemUsePermissions.java
View File

@@ -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;
}

10
EssentialsProtect/src/net/ess3/protect/Permissions.java
View File

@@ -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());
}
}

2
EssentialsProtect/src/net/ess3/protect/ProtectHolder.java
View File

@@ -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