From 638f8ad88b3b06a6da02b64b415801e10cd58d45 Mon Sep 17 00:00:00 2001 From: Dave Akers Date: Sat, 1 Sep 2018 14:33:39 -0500 Subject: [PATCH 1/3] Added ...island.addwarp permission to addon.yml --- src/main/resources/addon.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/resources/addon.yml b/src/main/resources/addon.yml index 056f6b0..fcb58dc 100755 --- a/src/main/resources/addon.yml +++ b/src/main/resources/addon.yml @@ -10,7 +10,13 @@ permissions: bskyblock.island.warp: description: Player can use warp or warps commands default: true + bskyblock.island.addwarp: + description: Player can create a welcome warp sign + default: true acidisland.island.warp: description: Player can use warp or warps commands default: true + acidisland.island.addwarp: + description: Player can create a welcome warp sign + default: true From b89d792b5e09c686decbc9e8c0640256c836f34a Mon Sep 17 00:00:00 2001 From: Dave Akers Date: Sat, 1 Sep 2018 14:55:55 -0500 Subject: [PATCH 2/3] getPermPrefix should return the actual prefix and not null --- src/main/java/bentobox/addon/warps/Warp.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/bentobox/addon/warps/Warp.java b/src/main/java/bentobox/addon/warps/Warp.java index 37b705c..7e9f00e 100644 --- a/src/main/java/bentobox/addon/warps/Warp.java +++ b/src/main/java/bentobox/addon/warps/Warp.java @@ -97,8 +97,7 @@ public class Warp extends Addon { } public String getPermPrefix(World world) { - this.getPlugin().getIWM().getPermissionPrefix(world); - return null; + return this.getPlugin().getIWM().getPermissionPrefix(world); } /** From bc185771882a353da459cb3503bcb9307a71820a Mon Sep 17 00:00:00 2001 From: Dave Akers Date: Sat, 1 Sep 2018 14:59:05 -0500 Subject: [PATCH 3/3] forgot the '.' --- src/main/java/bentobox/addon/warps/WarpSignsListener.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/bentobox/addon/warps/WarpSignsListener.java b/src/main/java/bentobox/addon/warps/WarpSignsListener.java index cd8a87f..0b920bc 100644 --- a/src/main/java/bentobox/addon/warps/WarpSignsListener.java +++ b/src/main/java/bentobox/addon/warps/WarpSignsListener.java @@ -68,7 +68,7 @@ public class WarpSignsListener implements Listener { // Welcome sign detected - check to see if it is // this player's sign if ((list.containsKey(user.getUniqueId()) && list.get(user.getUniqueId()).equals(s.getLocation())) - || user.isOp() || user.hasPermission(addon.getPermPrefix(e.getBlock().getWorld()) + "mod.removesign")) { + || user.isOp() || user.hasPermission(addon.getPermPrefix(e.getBlock().getWorld()) + ".mod.removesign")) { addon.getWarpSignsManager().removeWarp(s.getLocation()); Bukkit.getPluginManager().callEvent(new WarpRemoveEvent(addon, s.getLocation(), user.getUniqueId())); } else { @@ -96,9 +96,9 @@ public class WarpSignsListener implements Listener { // Check if someone is changing their own sign if (title.equalsIgnoreCase(addon.getConfig().getString("welcomeLine"))) { // Welcome sign detected - check permissions - if (!(user.hasPermission(addon.getPermPrefix(b.getWorld()) + "island.addwarp"))) { + if (!(user.hasPermission(addon.getPermPrefix(b.getWorld()) + ".island.addwarp"))) { user.sendMessage("warps.error.no-permission"); - user.sendMessage("general.errors.you-need", "[permission]", addon.getPermPrefix(b.getWorld()) + "island.addwarp"); + user.sendMessage("general.errors.you-need", "[permission]", addon.getPermPrefix(b.getWorld()) + ".island.addwarp"); return; } long level = plugin.getAddonsManager().getAddonByName(LEVEL_PLUGIN_NAME).map(l -> (Level)l)