diff --git a/src/main/java/com/alpsbte/plotsystem/commands/plot/CMD_Plot_Members.java b/src/main/java/com/alpsbte/plotsystem/commands/plot/CMD_Plot_Members.java index 3b61e769..ec7f2f71 100644 --- a/src/main/java/com/alpsbte/plotsystem/commands/plot/CMD_Plot_Members.java +++ b/src/main/java/com/alpsbte/plotsystem/commands/plot/CMD_Plot_Members.java @@ -25,6 +25,8 @@ public class CMD_Plot_Members extends SubCommand { + public static final String PERMISSION = "plotsystem.plot.members"; + public CMD_Plot_Members(BaseCommand baseCommand) { super(baseCommand); } @@ -104,6 +106,6 @@ public String[] getParameter() { @Override public String getPermission() { - return "plotsystem.plot.members"; + return PERMISSION; } } diff --git a/src/main/java/com/alpsbte/plotsystem/core/menus/PlotActionsMenu.java b/src/main/java/com/alpsbte/plotsystem/core/menus/PlotActionsMenu.java index 6f4eb870..32eedcb7 100644 --- a/src/main/java/com/alpsbte/plotsystem/core/menus/PlotActionsMenu.java +++ b/src/main/java/com/alpsbte/plotsystem/core/menus/PlotActionsMenu.java @@ -3,6 +3,7 @@ import com.alpsbte.alpslib.utils.item.ItemBuilder; import com.alpsbte.alpslib.utils.item.LoreBuilder; import com.alpsbte.plotsystem.PlotSystem; +import com.alpsbte.plotsystem.commands.plot.CMD_Plot_Members; import com.alpsbte.plotsystem.core.system.Builder; import com.alpsbte.plotsystem.core.system.plot.AbstractPlot; import com.alpsbte.plotsystem.core.system.plot.Plot; @@ -160,7 +161,7 @@ protected void setItemClickEventsAsync() { } FileConfiguration config = PlotSystem.getPlugin().getConfig(); - if ((getMenuPlayer() == plot.getPlotOwner().getPlayer() || getMenuPlayer().hasPermission("plotsystem.admin")) && config.getBoolean(ConfigPaths.ENABLE_GROUP_SUPPORT)) { + if (((getMenuPlayer() == plot.getPlotOwner().getPlayer() && getMenuPlayer().hasPermission(CMD_Plot_Members.PERMISSION)) || getMenuPlayer().hasPermission("plotsystem.admin")) && config.getBoolean(ConfigPaths.ENABLE_GROUP_SUPPORT)) { new PlotMemberMenu(plot, clickPlayer); } else if (plot.getPlotMembers().stream().anyMatch(m -> m.getUUID().equals(getMenuPlayer().getUniqueId()))) { // Leave Plot diff --git a/src/main/java/com/alpsbte/plotsystem/core/system/plot/utils/PlotUtils.java b/src/main/java/com/alpsbte/plotsystem/core/system/plot/utils/PlotUtils.java index 4172f1b3..8bb8e59d 100644 --- a/src/main/java/com/alpsbte/plotsystem/core/system/plot/utils/PlotUtils.java +++ b/src/main/java/com/alpsbte/plotsystem/core/system/plot/utils/PlotUtils.java @@ -1,6 +1,7 @@ package com.alpsbte.plotsystem.core.system.plot.utils; import com.alpsbte.plotsystem.PlotSystem; +import com.alpsbte.plotsystem.commands.plot.CMD_Plot_Members; import com.alpsbte.plotsystem.core.database.DataProvider; import com.alpsbte.plotsystem.core.system.Builder; import com.alpsbte.plotsystem.core.system.CityProject; @@ -652,7 +653,8 @@ public static void sendLinkMessages(AbstractPlot plot, Player player) { } public static void sendGroupTipMessage(@NotNull Plot plot, Player player) { - if (plot.getPlotMembers().isEmpty() && PlotSystem.getPlugin().getConfig().getBoolean(ConfigPaths.ENABLE_GROUP_SUPPORT)) { + if (plot.getPlotMembers().isEmpty() && PlotSystem.getPlugin().getConfig().getBoolean(ConfigPaths.ENABLE_GROUP_SUPPORT) + && player.hasPermission(CMD_Plot_Members.PERMISSION)) { Component tc = text("ยป ", DARK_GRAY) .append(text(LangUtil.getInstance().get(player, LangPaths.Note.Action.CLICK_TO_PLAY_WITH_FRIENDS), GRAY)) .clickEvent(ClickEvent.runCommand("/plot members " + plot.getId()))