Fix

NewNanCity · Aug 27, 2023 · ad8dc87 · ad8dc87
1 parent bb54456
commit ad8dc87
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ idea {
 
 val targetJavaVersion = 8
 
-version = "2.1.5"
+version = "2.1.6"
 group = "city.newnan.violet"
 description = "Useful toolkits java library for Bukkit Server Plugin."
 

diff --git a/src/main/kotlin/city/newnan/violet/gui/GuiManager.kt b/src/main/kotlin/city/newnan/violet/gui/GuiManager.kt
@@ -1,10 +1,12 @@
 package city.newnan.violet.gui
 
 import me.lucko.helper.Events
+import me.lucko.helper.event.filter.EventFilters
 import me.lucko.helper.terminable.Terminable
 import me.lucko.helper.terminable.TerminableConsumer
 import org.bukkit.entity.Player
 import org.bukkit.event.EventPriority
+import org.bukkit.event.inventory.InventoryInteractEvent
 import org.bukkit.event.player.AsyncPlayerChatEvent
 import org.bukkit.event.player.PlayerQuitEvent
 import org.bukkit.plugin.Plugin
@@ -23,6 +25,14 @@ class GuiManager(private val plugin: Plugin) : Terminable {
                 catch (e: Exception) { e.printStackTrace() }
             } }
             .also { if (plugin is TerminableConsumer) it.bindWith(plugin) }
+        Events.subscribe(InventoryInteractEvent::class.java, EventPriority.MONITOR)
+            .filter(EventFilters.ignoreCancelled())
+            .filter { it.whoClicked !is Player }
+            .handler {
+                playerSessions[it.whoClicked as Player]?.current?.also { gui ->
+                    if (gui.inventory != it.inventory) return@handler
+                }
+            }
     }
 
     override fun close() {

diff --git a/src/main/kotlin/city/newnan/violet/gui/PlayerGuiSession.kt b/src/main/kotlin/city/newnan/violet/gui/PlayerGuiSession.kt
@@ -6,7 +6,7 @@ import org.bukkit.entity.Player
 
 class PlayerGuiSession(val player: Player) {
     var chatInputHandlers: ((input: String) -> Boolean)? = null
-    val history = ArrayDeque<Triple<BaseGui, UpdateHandler<BaseGui>?, CloseHandler<BaseGui>?>>()
+    var history = ArrayDeque<Triple<BaseGui, UpdateHandler<BaseGui>?, CloseHandler<BaseGui>?>>()
     val length
         get() = history.size
 
@@ -100,15 +100,26 @@ class PlayerGuiSession(val player: Player) {
         }
     }
 
+    @Synchronized
     fun clear() {
-        current?.inventory?.viewers?.forEach { viewer ->
-            viewer.closeInventory()
-        }
-        while (history.isNotEmpty()) {
-            val (gui, _, close) = history.removeLast()
-            close?.invoke(CloseType.Hide, gui, this)
-        }
+        val oldHistory = history
+        history = ArrayDeque()
         chatInputHandlers = null
+        try {
+            oldHistory.lastOrNull()?.first?.inventory?.viewers?.forEach { viewer ->
+                viewer.closeInventory()
+            }
+            while (oldHistory.isNotEmpty()) {
+                val (gui, _, close) = oldHistory.removeLast()
+                try {
+                    close?.invoke(CloseType.Hide, gui, this)
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
     }
 
     /**