fix: offhand swap

DebitCardz · Feb 20, 2024 · 17fd727 · 17fd727
1 parent 8ebfefe
commit 17fd727
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.github.DebitCardz:mc-chestui-plus:1.4.7")
+    implementation("com.github.DebitCardz:mc-chestui-plus:1.4.9")
 }
 ```
 ### Maven
@@ -34,7 +34,7 @@ dependencies {
 <dependency>
     <groupId>com.github.DebitCardz</groupId>
     <artifactId>mc-chestui-plus</artifactId>
-    <version>1.4.7</version>
+    <version>1.4.9</version>
 </dependency>
 
 ```

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,7 @@ val githubActor = project.findProperty("gpr.user") as String? ?: System.getenv("
 val githubToken = project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN")
 
 group = "me.tech"
-version = "1.4.7"
+version = "1.4.9"
 
 repositories {
     mavenCentral()

diff --git a/src/main/kotlin/me/tech/mcchestui/listeners/GUISlotClickListener.kt b/src/main/kotlin/me/tech/mcchestui/listeners/GUISlotClickListener.kt
@@ -17,14 +17,23 @@ internal class GUISlotClickListener(gui: GUI) : GUIEventListener(gui) {
         val guiSlot = gui.slots.getOrNull(slot)
             ?: return // handle cancellation of task in onPlace.
 
-        if(click == ClickType.DROP || click == ClickType.CONTROL_DROP) {
-            if(!guiSlot.allowPickup) {
+        if(click in PICKUP_CLICK_ACTIONS) {
+            if(!gui.allowItemPickup) {
                 isCancelled = true
+                return
             }
         }
 
         guiSlot.onClick?.let { uiEvent ->
             uiEvent(this, whoClicked as Player)
         }
     }
+
+    companion object {
+        private val PICKUP_CLICK_ACTIONS = setOf(
+            ClickType.DROP,
+            ClickType.CONTROL_DROP,
+            ClickType.SWAP_OFFHAND
+        )
+    }
 }