Fixed self player top island counts as a paged object causing some is…

…lands to not be seen in top islands menu (#963)
BG-Software-LLC · Mar 4, 2022 · 13a215c · 13a215c
1 parent 5135660
commit 13a215c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/main/java/com/bgsoftware/superiorskyblock/menu/button/PagedObjectButton.java b/src/main/java/com/bgsoftware/superiorskyblock/menu/button/PagedObjectButton.java
@@ -35,6 +35,10 @@ public int getObjectIndex() {
         return objectIndex;
     }
 
+    public boolean countTowardsPageObjects() {
+        return true;
+    }
+
     @Nullable
     @Override
     public ItemStack getButtonItem(M superiorMenu) {

diff --git a/...va/com/bgsoftware/superiorskyblock/menu/button/impl/menu/TopIslandsPagedObjectButton.java b/...va/com/bgsoftware/superiorskyblock/menu/button/impl/menu/TopIslandsPagedObjectButton.java
@@ -49,6 +49,11 @@ private TopIslandsPagedObjectButton(String requiredPermission, SoundWrapper lack
         this.getNullItem().getEditableBuilder().asSkullOf((SuperiorPlayer) null);
     }
 
+    @Override
+    public boolean countTowardsPageObjects() {
+        return !this.isSelfPlayerIsland;
+    }
+
     @Override
     public ItemStack modifyButtonItem(ItemStack buttonItem, MenuTopIslands superiorMenu, Island island) {
         if (islandItem == null)

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/menu/pattern/impl/PagedMenuPattern.java b/src/main/java/com/bgsoftware/superiorskyblock/menu/pattern/impl/PagedMenuPattern.java
@@ -25,7 +25,8 @@ public final class PagedMenuPattern<M extends PagedSuperiorMenu<M, T>, T> extend
     private PagedMenuPattern(String title, InventoryType inventoryType, SuperiorMenuButton<M>[] buttons,
                              SoundWrapper openingSound, boolean isPreviousMoveAllowed) {
         super(title, inventoryType, buttons, openingSound, isPreviousMoveAllowed);
-        objectsPerPage = (int) Arrays.stream(buttons).filter(button -> button instanceof PagedObjectButton).count();
+        objectsPerPage = (int) Arrays.stream(buttons).filter(button -> button instanceof PagedObjectButton &&
+                ((PagedObjectButton<?, ?>) button).countTowardsPageObjects()).count();
     }
 
     public int getObjectsPerPage() {