diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-09-23 23:01:14 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-09-23 23:01:14 +0100 |
| commit | 533f67a687eb16c5ac5155e22f7dc2a53c9aa0cd (patch) | |
| tree | ff3c2b2f55f5b5815702d6ffbf8b97476fdf7c33 | |
| parent | ada750a2b3084a2fad2e519cb81151742516f42b (diff) | |
| download | Essentials-533f67a687eb16c5ac5155e22f7dc2a53c9aa0cd.tar Essentials-533f67a687eb16c5ac5155e22f7dc2a53c9aa0cd.tar.gz Essentials-533f67a687eb16c5ac5155e22f7dc2a53c9aa0cd.tar.lz Essentials-533f67a687eb16c5ac5155e22f7dc2a53c9aa0cd.tar.xz Essentials-533f67a687eb16c5ac5155e22f7dc2a53c9aa0cd.zip | |
Move wildcard perm check to superperms handler, rather than being PEX specific.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java | 2 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/perm/SuperpermsHandler.java | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java b/Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java index 565342e98..68dc3fe50 100644 --- a/Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java +++ b/Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java @@ -66,7 +66,7 @@ public class PermissionsExHandler extends SuperpermsHandler @Override public boolean hasPermission(final Player base, final String node) { - return base.hasPermission("*") || super.hasPermission(base, node); + return super.hasPermission(base, node); } @Override diff --git a/Essentials/src/com/earth2me/essentials/perm/SuperpermsHandler.java b/Essentials/src/com/earth2me/essentials/perm/SuperpermsHandler.java index aedd4c5ae..5dbe9eb93 100644 --- a/Essentials/src/com/earth2me/essentials/perm/SuperpermsHandler.java +++ b/Essentials/src/com/earth2me/essentials/perm/SuperpermsHandler.java @@ -33,6 +33,10 @@ public class SuperpermsHandler implements IPermissionsHandler @Override public boolean hasPermission(final Player base, final String node) { + if (base.hasPermission("*")) + { + return true; + } if (base.hasPermission("-" + node)) { return false; |