diff options
Diffstat (limited to 'patches/server/0706-Respect-despawn-rate-in-item-merge-check.patch')
| -rw-r--r-- | patches/server/0706-Respect-despawn-rate-in-item-merge-check.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/0706-Respect-despawn-rate-in-item-merge-check.patch b/patches/server/0706-Respect-despawn-rate-in-item-merge-check.patch new file mode 100644 index 0000000000..8967390e3e --- /dev/null +++ b/patches/server/0706-Respect-despawn-rate-in-item-merge-check.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Noah van der Aa <[email protected]> +Date: Wed, 18 Aug 2021 23:01:55 +0200 +Subject: [PATCH] Respect despawn rate in item merge check + + +diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java +index 47b946f7b761a318780b7c1973d0450faf7e8b62..f7d29950644a5cf12da0d31246d9f5fcbcc201bb 100644 +--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java ++++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java +@@ -261,7 +261,7 @@ public class ItemEntity extends Entity { + private boolean isMergable() { + ItemStack itemstack = this.getItem(); + +- return this.isAlive() && this.pickupDelay != 32767 && this.age != -32768 && this.age < 6000 && itemstack.getCount() < itemstack.getMaxStackSize(); ++ return this.isAlive() && this.pickupDelay != 32767 && this.age != -32768 && this.age < this.getDespawnRate() && itemstack.getCount() < itemstack.getMaxStackSize(); // Paper - respect despawn rate in pickup check. + } + + private void tryToMerge(ItemEntity other) { |