fix: non-null pickup event

DebitCardz · Aug 19, 2024 · 98d8c5c · 98d8c5c
1 parent 4142002
commit 98d8c5c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.github.DebitCardz:mc-chestui-plus:1.5.0")
+    implementation("com.github.DebitCardz:mc-chestui-plus:1.5.6")
 }
 ```
 ### Maven
@@ -34,7 +34,7 @@ dependencies {
 <dependency>
     <groupId>com.github.DebitCardz</groupId>
     <artifactId>mc-chestui-plus</artifactId>
-    <version>1.5.0</version>
+    <version>1.5.6</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.5.5"
+version = "1.5.6"
 
 repositories {
     mavenCentral()

diff --git a/src/main/kotlin/me/tech/mcchestui/listeners/item/GUIItemPickupListener.kt b/src/main/kotlin/me/tech/mcchestui/listeners/item/GUIItemPickupListener.kt
@@ -22,12 +22,14 @@ internal class GUIItemPickupListener(gui: GUI): GUIEventListener(gui) {
         }
 
         if(clickedInventory == whoClicked.inventory) {
-            if(currentItem == null || currentItem?.type?.isEmpty == true) {
+            val itemStack = currentItem
+                ?: return
+            if(itemStack.type.isEmpty) {
                 return
             }
 
             gui.onPlayerInventoryPickupItem?.let { uiEvent ->
-                uiEvent(this, whoClicked as Player, currentItem, slot).let { outcome ->
+                uiEvent(this, whoClicked as Player, itemStack, slot).let { outcome ->
                     isCancelled = outcome
                 }
             }

diff --git a/src/main/kotlin/me/tech/mcchestui/utils/GUIHelper.kt b/src/main/kotlin/me/tech/mcchestui/utils/GUIHelper.kt
@@ -54,7 +54,7 @@ internal typealias GUIItemPlaceEvent = InventoryClickEvent.(player: Player, item
 /**
  * Event when a [ItemStack] or [GUI.Slot] is picked up.
  */
-internal typealias GUIItemPickupEvent = InventoryClickEvent.(player: Player, item: ItemStack?, slot: Int) -> Boolean
+internal typealias GUIItemPickupEvent = InventoryClickEvent.(player: Player, item: ItemStack, slot: Int) -> Boolean
 
 /**
  * Event when an [ItemStack] is dragged across a [GUI].