From 8bdb4928a74c2be3fa33a89b1ec559d71942da71 Mon Sep 17 00:00:00 2001
From: iambibi_ <89582596+iambibi@users.noreply.github.com>
Date: Mon, 18 May 2026 16:41:49 +0200
Subject: [PATCH 1/2] fix: back button clear history
 https://github.com/ServerOpenMC/PluginV2/issues/1250

---
 src/main/java/fr/openmc/api/menulib/MenuLib.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/fr/openmc/api/menulib/MenuLib.java b/src/main/java/fr/openmc/api/menulib/MenuLib.java
index be40b8cfa..1dbe4937b 100644
--- a/src/main/java/fr/openmc/api/menulib/MenuLib.java
+++ b/src/main/java/fr/openmc/api/menulib/MenuLib.java
@@ -220,7 +220,8 @@ public void onClose(InventoryCloseEvent e) {
         if (e.getInventory().getHolder(false) instanceof PaginatedMenu paginatedMenu) {
             paginatedMenu.onClose(e);
             Bukkit.getScheduler().runTaskLater(OMCPlugin.getInstance(), () -> {
-                if (!(e.getPlayer().getOpenInventory().getTopInventory().getHolder() instanceof PaginatedMenu)) {
+                if (!(e.getPlayer().getOpenInventory().getTopInventory().getHolder() instanceof PaginatedMenu) &&
+                        !(e.getPlayer().getOpenInventory().getTopInventory().getHolder() instanceof Menu)) {
                     MenuLib.clearHistory(player);
                 }
             }, 1L);

From 423fb80a873958e1bb0dafd72c2ca793e2aa894d Mon Sep 17 00:00:00 2001
From: iambibi_ <89582596+iambibi@users.noreply.github.com>
Date: Mon, 18 May 2026 17:24:44 +0200
Subject: [PATCH 2/2] review toutouchien

---
 src/main/java/fr/openmc/api/menulib/MenuLib.java | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/main/java/fr/openmc/api/menulib/MenuLib.java b/src/main/java/fr/openmc/api/menulib/MenuLib.java
index 1dbe4937b..8b54d450f 100644
--- a/src/main/java/fr/openmc/api/menulib/MenuLib.java
+++ b/src/main/java/fr/openmc/api/menulib/MenuLib.java
@@ -217,16 +217,6 @@ public void onInventoryDrag(InventoryDragEvent e) {
     @EventHandler
     public void onClose(InventoryCloseEvent e) {
         if (!(e.getPlayer() instanceof  Player player)) return;
-        if (e.getInventory().getHolder(false) instanceof PaginatedMenu paginatedMenu) {
-            paginatedMenu.onClose(e);
-            Bukkit.getScheduler().runTaskLater(OMCPlugin.getInstance(), () -> {
-                if (!(e.getPlayer().getOpenInventory().getTopInventory().getHolder() instanceof PaginatedMenu) &&
-                        !(e.getPlayer().getOpenInventory().getTopInventory().getHolder() instanceof Menu)) {
-                    MenuLib.clearHistory(player);
-                }
-            }, 1L);
-            return;
-        }
 
         if (e.getInventory().getHolder(false) instanceof Menu menu) {
             menu.onClose(e);