diff options
Diffstat (limited to 'EssentialsProtect/src/net/ess3/protect/Permissions.java')
| -rw-r--r-- | EssentialsProtect/src/net/ess3/protect/Permissions.java | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/EssentialsProtect/src/net/ess3/protect/Permissions.java b/EssentialsProtect/src/net/ess3/protect/Permissions.java index 37042618b..f9a6aad7b 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 net.ess3.api.IPermission; -import net.ess3.utils.Util; import java.util.Locale; +import net.ess3.api.IPermission; +import net.ess3.bukkit.PermissionFactory; import org.bukkit.command.CommandSender; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; @@ -10,13 +10,9 @@ import org.bukkit.permissions.PermissionDefault; public enum Permissions implements IPermission { - ALERTS, - ALERTS_NOTRIGGER, - ADMIN, - BUILD(PermissionDefault.TRUE), + + ADMIN, ENTITYTARGET(PermissionDefault.TRUE), - INTERACT(PermissionDefault.TRUE), - OWNERINFO, PVP(PermissionDefault.TRUE), PREVENTDAMAGE_FALL(PermissionDefault.FALSE), PREVENTDAMAGE_CREEPER(PermissionDefault.FALSE), @@ -29,8 +25,7 @@ public enum Permissions implements IPermission PREVENTDAMAGE_FIRE(PermissionDefault.FALSE), PREVENTDAMAGE_DROWNING(PermissionDefault.FALSE), PREVENTDAMAGE_LIGHTNING(PermissionDefault.FALSE), - PREVENTDAMAGE_NONE(PermissionDefault.FALSE), - RAILS(PermissionDefault.TRUE), + PREVENTDAMAGE_NONE(PermissionDefault.FALSE), USEFLINTSTEEL(PermissionDefault.TRUE); private static final String base = "essentials.protect."; private final String permission; @@ -49,13 +44,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 +58,7 @@ public enum Permissions implements IPermission } else { - return Util.registerPermission(getPermission(), getPermissionDefault()); + return PermissionFactory.registerPermission(getPermissionName(), getPermissionDefault()); } } @@ -76,6 +71,6 @@ public enum Permissions implements IPermission @Override public boolean isAuthorized(final CommandSender sender) { - return sender.hasPermission(getBukkitPermission()); + return sender.hasPermission(getPermission()); } } |