From fbfb05faf925cf8b5c74c700719697eb8356062b Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 13 May 2017 17:38:09 +0200 Subject: [PATCH] Fixed help message for shop creation --- .../java/de/epiceric/shopchest/ShopCommand.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/epiceric/shopchest/ShopCommand.java b/src/main/java/de/epiceric/shopchest/ShopCommand.java index 7236144..8cac67c 100644 --- a/src/main/java/de/epiceric/shopchest/ShopCommand.java +++ b/src/main/java/de/epiceric/shopchest/ShopCommand.java @@ -17,6 +17,7 @@ import org.bukkit.command.*; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; +import org.bukkit.permissions.PermissionAttachmentInfo; import org.bukkit.plugin.Plugin; import java.lang.reflect.Constructor; @@ -548,10 +549,21 @@ class ShopCommand implements CommandExecutor { private void sendBasicHelpMessage(CommandSender sender) { plugin.debug("Sending basic help message to " + sender.getName()); + boolean receiveCreateMessage = sender.hasPermission(Permissions.CREATE); + if (!receiveCreateMessage) { + for (PermissionAttachmentInfo permInfo : sender.getEffectivePermissions()) { + String perm = permInfo.getPermission(); + if (perm.startsWith(Permissions.CREATE) && sender.hasPermission(perm)) { + receiveCreateMessage = true; + break; + } + } + } + if (sender instanceof Player) { if (sender.hasPermission(Permissions.CREATE_ADMIN)) { sender.sendMessage(ChatColor.GREEN + "/" + plugin.getShopChestConfig().main_command_name + " create [normal|admin] - " + LanguageUtils.getMessage(LocalizedMessage.Message.COMMAND_DESC_CREATE)); - } else if (sender.hasPermission(Permissions.CREATE)) { + } else if (receiveCreateMessage) { sender.sendMessage(ChatColor.GREEN + "/" + plugin.getShopChestConfig().main_command_name + " create - " + LanguageUtils.getMessage(LocalizedMessage.Message.COMMAND_DESC_CREATE)); }