diff --git a/Resources/plugin.yml b/Resources/plugin.yml index 5dd981a..5be4f79 100644 --- a/Resources/plugin.yml +++ b/Resources/plugin.yml @@ -15,6 +15,7 @@ commands: permissions: advancedportals.*: description: Gives access to all commands + default: op children: advancedportals.createportal: true advancedportals.portal: true @@ -33,9 +34,6 @@ permissions: advancedportals.desti: description: Gives access to all desti commands default: op - advancedportals.desti.default: - description: Gives access to all destinations (really need to make proper desti warp permission setup) - default: true advancedportals.warp.*: description: Access to all warps - default: op + default: true diff --git a/src/com/sekwah/advancedportals/destinations/Destination.java b/src/com/sekwah/advancedportals/destinations/Destination.java index d54fdc5..15258cd 100644 --- a/src/com/sekwah/advancedportals/destinations/Destination.java +++ b/src/com/sekwah/advancedportals/destinations/Destination.java @@ -108,8 +108,7 @@ public class Destination { } public static boolean warp(Player player, String name) { - if (!player.hasPermission("advancedportals.warp.*") && !player.hasPermission("advancedportals.desti." + name) - && !player.hasPermission("advancedportals.warp.default")) { + if (!(player.hasPermission("advancedportals.warp.*") || player.hasPermission("advancedportals.warp." + name))) { player.sendMessage(PluginMessages.customPrefixFail + " You don't have permission to warp to " + name + "!"); return false; }