Actually fix GUI inventory interaction without messing up click handlers

2024-08-09 08:35:44 -06:00
parent d5e471e576
commit 4e7c6af1ed
1 changed files with 7 additions and 2 deletions
--- a/src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt
+++ b/src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt
@@ -19,8 +19,13 @@ object GUIHolder : AutoCloseable {

    init {
        listen<InventoryClickEvent> {
-            val clickedInv = it.inventory
-            val gui = registered[clickedInv] ?: return@listen
+            val clickedInv = it.clickedInventory ?: return@listen
+            val gui = registered[clickedInv] ?: run {
+                if (registered[it.inventory] != null) {
+                    it.isCancelled = true
+                }
+                return@listen
+            }
            val player = it.playerOrCancel ?: return@listen

            if (gui.isInMove) {