mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-31 07:49:57 +01:00
20 lines
1.1 KiB
Diff
20 lines
1.1 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Noah van der Aa <ndvdaa@gmail.com>
|
||
|
|
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 158719d46c96bb733a00e08c8285f41a48406abf..063f3e4c67e6716c9a03dbe4b72eafd32e4f0d53 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
||
|
|
@@ -262,7 +262,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) {
|