Ability to track menus during inventory open event

SakiPowered · Aug 25, 2024 · 79237a0 · 79237a0
1 parent 754b077
commit 79237a0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/api/src/main/java/gg/saki/zaiko/Menu.java b/api/src/main/java/gg/saki/zaiko/Menu.java
@@ -166,9 +166,9 @@ public final void open(@NotNull Player player) {
             inventory.setItem(i, placeable.getItem());
         }
 
-        player.openInventory(inventory);
-
         this.zaiko.openMenus.put(player.getUniqueId(), this);
+
+        player.openInventory(inventory);
     }
 
 

diff --git a/api/src/main/java/gg/saki/zaiko/MenuListener.java b/api/src/main/java/gg/saki/zaiko/MenuListener.java
@@ -28,8 +28,12 @@
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.*;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.event.inventory.InventoryDragEvent;
+import org.bukkit.event.inventory.InventoryOpenEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
@@ -120,4 +124,19 @@ private void onClose(InventoryCloseEvent event) {
         // internal close/cleanup
         menu.close(player, event.getInventory(), true);
     }
+
+    @EventHandler(priority = EventPriority.LOWEST)
+    private void onOpen(InventoryOpenEvent event) {
+        if (!(event.getPlayer() instanceof Player)) return;
+
+        Player player = (Player) event.getPlayer();
+
+        Menu menu = this.zaiko.getOpenMenu(player.getUniqueId());
+
+        if (menu == null) return;
+
+        if(!event.isCancelled()) return;
+
+        this.zaiko.openMenus.remove(player.getUniqueId());
+    }
 }