fix: Run item drop event on a temporary item entity since dropped ite…

…m has already left inventory fix: IIOB for GearyPlayerInventory.find which returns a nullable
MineInAbyss · Jun 5, 2024 · 499f8fb · 499f8fb
1 parent 11f77ed
commit 499f8fb
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/...ge/src/main/kotlin/com/mineinabyss/geary/papermc/bridge/events/items/ItemRemovedBridge.kt b/...ge/src/main/kotlin/com/mineinabyss/geary/papermc/bridge/events/items/ItemRemovedBridge.kt
@@ -1,6 +1,9 @@
 package com.mineinabyss.geary.papermc.bridge.events.items
 
+import com.mineinabyss.geary.helpers.addParent
+import com.mineinabyss.geary.papermc.tracking.entities.toGeary
 import com.mineinabyss.geary.papermc.tracking.items.inventory.toGeary
+import com.mineinabyss.geary.papermc.tracking.items.itemEntityContext
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import org.bukkit.event.EventHandler
@@ -36,7 +39,10 @@ class ItemRemovedBridge : Listener {
 
     @EventHandler(ignoreCancelled = true)
     fun PlayerDropItemEvent.emitOnItemDrop() {
-        val droppedItem = player.inventory.toGeary()?.find(itemDrop.itemStack) ?: return
-        droppedItem.emit<OnItemDrop>()
+        itemEntityContext {
+            val droppedItem = itemDrop.itemStack.toGearyOrNull() ?: return
+            droppedItem.addParent(player.toGeary())
+            droppedItem.emit<OnItemDrop>()
+        }
     }
 }
diff --git a/...tracking/src/main/kotlin/com/mineinabyss/geary/papermc/tracking/items/GearyItemContext.kt b/...tracking/src/main/kotlin/com/mineinabyss/geary/papermc/tracking/items/GearyItemContext.kt
@@ -10,7 +10,15 @@ class GearyItemContext : Closeable {
     val cached = mutableMapOf<ItemStack, GearyEntity>()
     fun ItemStack.toGeary(): GearyEntity {
         return cached.getOrPut(this) {
-            gearyItems.itemProvider.deserializeItemStackToEntity(this.fastPDC) ?: entity()
+            toGearyOrNull() ?: entity()
+        }
+    }
+
+    fun ItemStack.toGearyOrNull(): GearyEntity? {
+        return cached.getOrPut(this) {
+            gearyItems.itemProvider.deserializeItemStackToEntity(this.fastPDC)?.apply {
+                set<ItemStack>(this@toGearyOrNull)
+            } ?: return null
         }
     }
 

diff --git a/...ain/kotlin/com/mineinabyss/geary/papermc/tracking/items/inventory/GearyPlayerInventory.kt b/...ain/kotlin/com/mineinabyss/geary/papermc/tracking/items/inventory/GearyPlayerInventory.kt
@@ -44,7 +44,9 @@ class GearyPlayerInventory(
     }
 
     fun find(itemStack: ItemStack): GearyEntity? {
-        return get(inventory.indexOf(itemStack))
+        val index = inventory.indexOf(itemStack)
+        if (index == -1) return null
+        return get(index)
     }
 
     // We use custom cursor slot so can't just call get