Fix Window closeable

Author: NichtStudioCode

invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractWindow.java

@@ -181,12 +181,14 @@ public void handleOpenEvent(InventoryOpenEvent event) {
         }
     }
 
-    public void handleCloseEvent(Player player) {
-        if (closeable) {
+    public void handleCloseEvent(Player player, boolean forceClose) {
+        if (closeable || forceClose) {
             if (!currentlyOpen)
                 throw new IllegalStateException("Window is already closed!");
 
+            closeable = true;
             currentlyOpen = false;
+            
             remove();
 
             // handleClosed() might have already been called by open() if the window was replaced by another one
@@ -198,9 +200,8 @@ public void handleCloseEvent(Player player) {
             if (closeHandlers != null) {
                 closeHandlers.forEach(Runnable::run);
             }
-        } else {
-            if (player.equals(getViewer()))
-                Bukkit.getScheduler().runTaskLater(InvUI.getInstance().getPlugin(), this::open, 0);
+        } else if (player.equals(getViewer())) {
+            Bukkit.getScheduler().runTaskLater(InvUI.getInstance().getPlugin(), () -> openInventory(player), 0);
         }
     }
 
@@ -282,9 +283,9 @@ public void close() {
     public void open() {
         Player viewer = getViewer();
         if (viewer == null)
-            throw new IllegalStateException("The player is not online.");
+            throw new IllegalStateException("Viewer is not online");
         if (currentlyOpen)
-            throw new IllegalStateException("Window is already opened!");
+            throw new IllegalStateException("Window is already open");
 
         // call handleClosed() close for currently open window
         AbstractWindow openWindow = (AbstractWindow) WindowManager.getInstance().getOpenWindow(viewer);

invui-core/src/main/java/xyz/xenondevs/invui/window/WindowManager.java

@@ -124,7 +124,7 @@ private void handleInventoryClose(InventoryCloseEvent event) {
         Player player = (Player) event.getPlayer();
         AbstractWindow window = (AbstractWindow) getWindow(event.getInventory());
         if (window != null) {
-            window.handleCloseEvent(player);
+            window.handleCloseEvent(player, false);
         }
 
         windowsByPlayer.remove(player);
@@ -144,7 +144,7 @@ private void handlePlayerQuit(PlayerQuitEvent event) {
         Player player = event.getPlayer();
         AbstractWindow window = (AbstractWindow) getOpenWindow(player);
         if (window != null) {
-            window.handleCloseEvent(player);
+            window.handleCloseEvent(player, true);
             windowsByPlayer.remove(player);
         }
     }