Merge pull request #334 from Neige7/patch-1

修复某些情况下PlayerUtil.giveItem可能吞物品的问题
TabooLib · Jul 24, 2023 · 0f92333 · 0f92333
2 parents 9db2ee0 + a27c899
commit 0f92333
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/platform/platform-bukkit/src/main/kotlin/taboolib/platform/util/PlayerUtil.kt b/platform/platform-bukkit/src/main/kotlin/taboolib/platform/util/PlayerUtil.kt
@@ -14,7 +14,12 @@ fun HumanEntity.giveItem(itemStack: List<ItemStack>) {
 
 fun HumanEntity.giveItem(itemStack: ItemStack?, repeat: Int = 1) {
     if (itemStack.isNotAir()) {
-        repeat(repeat) { inventory.addItem(itemStack).values.forEach { world.dropItem(location, it) } }
+        // CraftInventory.addItem 的执行过程中, 实质上有可能修改ItemStack的amount, 如果不注意这一点, 则会吞物品而不自知
+        val preAmount = itemStack.amount
+        repeat(repeat) {
+            inventory.addItem(itemStack).values.forEach { world.dropItem(location, it) }
+            itemStack.amount = preAmount
+        }
     }
 }
 
@@ -48,4 +53,4 @@ fun HumanEntity.feed() {
 
 fun HumanEntity.saturate() {
     saturation = 20F
-}
+}