diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-09-20 20:21:45 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-09-20 20:21:45 +0100 |
| commit | 16834d85c5dece25c4153ac5eea6d7663c5fca35 (patch) | |
| tree | 15b5a44722ba4f5232716537e980f59cc23e23ae | |
| parent | 44d8c854504546917091543b7ce3a9dbab239e53 (diff) | |
| download | Essentials-16834d85c5dece25c4153ac5eea6d7663c5fca35.tar Essentials-16834d85c5dece25c4153ac5eea6d7663c5fca35.tar.gz Essentials-16834d85c5dece25c4153ac5eea6d7663c5fca35.tar.lz Essentials-16834d85c5dece25c4153ac5eea6d7663c5fca35.tar.xz Essentials-16834d85c5dece25c4153ac5eea6d7663c5fca35.zip | |
Switch pex permissions checks to use superperms rather than direct api call.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java | 2 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index f19f0f763..8718f84a7 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -496,7 +496,7 @@ public class EssentialsPlayerListener implements Listener } } - @EventHandler(priority = EventPriority.LOWEST) + @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) public void onInventoryClickEvent(final InventoryClickEvent event) { if (event.getView().getTopInventory().getType() == InventoryType.PLAYER) diff --git a/Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java b/Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java index ae19f57dd..4aef6206f 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 implements IPermissionsHandler @Override public boolean hasPermission(final Player base, final String node) { - return manager.has(base.getName(), node, base.getWorld().getName()); + return base.hasPermission(node); } @Override |