From 5f400c76d6ea597da3107dc3c6d3f1d81bd8b9be Mon Sep 17 00:00:00 2001
From: mallusrgreatv2 <mallusrgreat@duck.com>
Date: Fri, 20 Feb 2026 19:51:16 +0530
Subject: [PATCH] Update arena select menu to obey borders

---
 .../java/dev/lrxh/neptune/configs/impl/MenusLocale.java  | 1 +
 .../dev/lrxh/neptune/game/duel/menu/ArenaSelectMenu.java | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/MenusLocale.java b/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/MenusLocale.java
index 31bca26e..b89204d7 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/MenusLocale.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/MenusLocale.java
@@ -103,6 +103,7 @@ public enum MenusLocale implements IDataAccessor {
     ARENA_TITLE("ARENA.TITLE", DataType.STRING, "Select an arena"),
     ARENA_FILTER("ARENA.FILTER-TYPE", DataType.STRING, "FILL"),
     ARENA_SIZE("ARENA.SIZE", DataType.INT, "27"),
+    ARENA_LIST_STARTING_SLOT("ARENA.LIST.STARTING-SLOT", DataType.INT, "1"),
     ARENA_ITEM_NAME("ARENA.ITEM.NAME", DataType.STRING, "&b<arena>"),
     ARENA_ITEM_LORE("ARENA.ITEM.LORE", DataType.STRING_LIST, "", "&fSelect <arena> as the battle arena"),
     ARENA_RANDOM_ITEM_NAME("ARENA.RANDOM_ITEM.NAME", DataType.STRING, "&bRandom Arena"),
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/game/duel/menu/ArenaSelectMenu.java b/Plugin/src/main/java/dev/lrxh/neptune/game/duel/menu/ArenaSelectMenu.java
index eb327ccd..c832aa79 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/game/duel/menu/ArenaSelectMenu.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/game/duel/menu/ArenaSelectMenu.java
@@ -38,7 +38,7 @@ public ArenaSelectMenu(Kit kit, UUID receiver, int round) {
     @Override
     public List<Button> getButtons(Player player) {
         List<Button> buttons = new ArrayList<>();
-        int i = 1;
+        int i = MenusLocale.ARENA_LIST_STARTING_SLOT.getInt();
 
         buttons.add(new Button(MenusLocale.ARENA_RANDOM_ITEM_SLOT.getInt()) {
             @Override
@@ -64,8 +64,13 @@ public void onClick(ClickType type, Player p) {
                 });
             }
         });
-
+        int rows = MenusLocale.ARENA_SIZE.getInt() / 9;
+        boolean isBorder = MenusLocale.ARENA_FILTER.getString().equals("BORDER");
         for (Arena arena : kit.getArenas()) {
+            int row = i / 9;
+            int col = i % 9;
+            if (col == 8 && isBorder) i += 2;
+            if (row == rows - 1 && isBorder) i += 9;
             buttons.add(new Button(i++) {
                 @Override
                 public ItemStack getItemStack(Player p) {