Fix closeInventory being incorrectly called

Author: Aeltumn

interfaces/src/main/kotlin/com/noxcrew/interfaces/InterfacesListeners.kt

@@ -157,12 +157,16 @@ public class InterfacesListeners private constructor(private val plugin: Plugin)
         view.savePersistentItems(event.inventory)
 
         SCOPE.launch {
+            // Determine if we can re-open a previous interface
+            val openInterface = getOpenInterface(event.player.uniqueId)
+            val shouldReopen = reason in REOPEN_REASONS && !event.player.isDead && openInterface != null
+
             // Mark the current view as closed properly
-            view.markClosed(reason)
+            view.markClosed(reason, !shouldReopen && reason != Reason.OPEN_NEW)
 
-            // Try to open back up a previous interface
-            if (reason in REOPEN_REASONS && !event.player.isDead) {
-                getOpenInterface(event.player.uniqueId)?.open()
+            // If possible, open back up a previous interface
+            if (shouldReopen) {
+                requireNotNull(openInterface).open()
             }
         }
     }

interfaces/src/main/kotlin/com/noxcrew/interfaces/view/AbstractInterfaceView.kt

@@ -82,7 +82,10 @@ public abstract class AbstractInterfaceView<I : InterfacesInventory, P : Pane>(
     public abstract fun openInventory()
 
     /** Marks this menu as closed and processes it. */
-    internal suspend fun markClosed(reason: InventoryCloseEvent.Reason = InventoryCloseEvent.Reason.UNKNOWN) {
+    internal suspend fun markClosed(
+        reason: InventoryCloseEvent.Reason = InventoryCloseEvent.Reason.UNKNOWN,
+        closeInventory: Boolean = reason != InventoryCloseEvent.Reason.OPEN_NEW
+    ) {
         // End a possible chat query with the listener
         InterfacesListeners.INSTANCE.abortQuery(player.uniqueId, this)
 
@@ -101,7 +104,7 @@ public abstract class AbstractInterfaceView<I : InterfacesInventory, P : Pane>(
         // properly.
         for ((child) in children) {
             if (child.shouldBeOpened.get()) {
-                child.close()
+                child.close(reason, closeInventory)
             }
         }
     }
@@ -153,10 +156,10 @@ public abstract class AbstractInterfaceView<I : InterfacesInventory, P : Pane>(
         }
     }
 
-    override suspend fun close() {
+    override suspend fun close(reason: InventoryCloseEvent.Reason, closeInventory: Boolean) {
         markClosed()
 
-        if (isOpen()) {
+        if (isOpen() && closeInventory) {
             // Ensure we always close on the main thread!
             runSync {
                 player.closeInventory()

interfaces/src/main/kotlin/com/noxcrew/interfaces/view/InterfaceView.kt

@@ -2,6 +2,7 @@ package com.noxcrew.interfaces.view
 
 import net.kyori.adventure.text.Component
 import org.bukkit.entity.Player
+import org.bukkit.event.inventory.InventoryCloseEvent
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
@@ -27,7 +28,10 @@ public interface InterfaceView {
     public suspend fun open()
 
     /** Closes this view. */
-    public suspend fun close()
+    public suspend fun close(
+        reason: InventoryCloseEvent.Reason = InventoryCloseEvent.Reason.PLUGIN,
+        closeInventory: Boolean = reason != InventoryCloseEvent.Reason.OPEN_NEW
+    )
 
     /** Returns whether this view is opened based on the player's current shown inventory. */
     public fun isOpen(): Boolean