Enable template to determine what is shown/clickable. (#2269)

BentoBoxWorld · Jan 12, 2024 · 76a36e6 · 76a36e6
1 parent f1001b1
commit 76a36e6
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommand.java
@@ -193,6 +193,10 @@ private PanelItem createInviteButton(ItemTemplateRecord template, TemplatedPanel
         builder.name(user.getTranslation("commands.island.team.gui.buttons.invite.name"));
         builder.description(user.getTranslation("commands.island.team.gui.buttons.invite.description"));
         builder.clickHandler((panel, user, clickType, clickSlot) -> {
+            if (!template.actions().stream().anyMatch(ar -> clickType.equals(ar.clickType()))) {
+                // If the click type is not in the template, don't do anything
+                return true;
+            }
             if (clickType.equals(ClickType.LEFT)) {
                 user.closeInventory();
                 this.inviteCommand.build(user);
@@ -229,6 +233,10 @@ private PanelItem createRankButton(ItemTemplateRecord template, TemplatedPanel.I
         });
         builder.description(user.getTranslation("commands.island.team.gui.buttons.rank-filter.description"));
         builder.clickHandler((panel, user, clickType, clickSlot) -> {
+            if (!template.actions().stream().anyMatch(ar -> clickType.equals(ar.clickType()))) {
+                // If the click type is not in the template, don't do anything
+                return true;
+            }
             if (clickType.equals(ClickType.LEFT)) {
                 rank = RanksManager.getInstance().getRankDownValue(rank);
                 if (rank <= RanksManager.VISITOR_RANK) {
@@ -289,6 +297,10 @@ private PanelItem createInvitedButton(ItemTemplateRecord template, TemplatedPane
                             + user.getTranslation(ar.tooltip()))
                     .toList());
             builder.clickHandler((panel, user, clickType, clickSlot) -> {
+                if (!template.actions().stream().anyMatch(ar -> clickType.equals(ar.clickType()))) {
+                    // If the click type is not in the template, don't do anything
+                    return true;
+                }
                 if (clickType.equals(ClickType.SHIFT_LEFT) && user.hasPermission(this.acceptCommand.getPermission())) {
                     getPlugin().log("Invite accepted: " + user.getName() + " accepted " + invite.getType()
                             + " invite to island at " + island.getCenter());
@@ -482,6 +494,10 @@ private PanelItem getMemberButton(int targetRank, int slot, List<ActionRecords>
 
     private boolean clickListener(Panel panel, User clickingUser, ClickType clickType, int i, User target,
             List<ActionRecords> actions) {
+        if (!actions.stream().anyMatch(ar -> clickType.equals(ar.clickType()))) {
+            // If the click type is not in the template, don't do anything
+            return true;
+        }
         int rank = Objects.requireNonNull(island).getRank(clickingUser);
         for (ItemTemplateRecord.ActionRecords action : actions) {
             if (clickType.equals(action.clickType())) {