diff options
author | snowleo <schneeleo@gmail.com> | 2012-10-03 15:57:37 +0200 |
---|---|---|
committer | snowleo <schneeleo@gmail.com> | 2012-10-03 15:57:37 +0200 |
commit | b677dbfb25c4fbd1bee8bff90a8f2275a437a895 (patch) | |
tree | bddd00cd9aeffa3ec88b97cd83a5603828b39196 /EssentialsProtect | |
parent | 53b512415eb8524a0ca5442592c1f5eba98e6f77 (diff) | |
download | Essentials-b677dbfb25c4fbd1bee8bff90a8f2275a437a895.tar Essentials-b677dbfb25c4fbd1bee8bff90a8f2275a437a895.tar.gz Essentials-b677dbfb25c4fbd1bee8bff90a8f2275a437a895.tar.lz Essentials-b677dbfb25c4fbd1bee8bff90a8f2275a437a895.tar.xz Essentials-b677dbfb25c4fbd1bee8bff90a8f2275a437a895.zip |
New permission checks, now only registers the parent nodes and needs two checks. This combines the 2.9 and 3.0 permission check methods.
Diffstat (limited to 'EssentialsProtect')
-rw-r--r-- | EssentialsProtect/src/net/ess3/protect/Permissions.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/EssentialsProtect/src/net/ess3/protect/Permissions.java b/EssentialsProtect/src/net/ess3/protect/Permissions.java index f9a6aad7b..2a7db4130 100644 --- a/EssentialsProtect/src/net/ess3/protect/Permissions.java +++ b/EssentialsProtect/src/net/ess3/protect/Permissions.java @@ -30,7 +30,7 @@ public enum Permissions implements IPermission private static final String base = "essentials.protect."; private final String permission; private final PermissionDefault defaultPerm; - private transient Permission bukkitPerm = null; + private transient String parent = null; private Permissions() { @@ -50,15 +50,15 @@ public enum Permissions implements IPermission } @Override - public Permission getPermission() + public String getParentPermission() { - if (bukkitPerm != null) + if (parent != null) { - return bukkitPerm; + return parent; } else { - return PermissionFactory.registerPermission(getPermissionName(), getPermissionDefault()); + return PermissionFactory.registerParentPermission(getPermissionName()); } } @@ -71,6 +71,6 @@ public enum Permissions implements IPermission @Override public boolean isAuthorized(final CommandSender sender) { - return sender.hasPermission(getPermission()); + return PermissionFactory.checkPermission(sender, this); } } |