geforkt von Mirrors/Paper
Respect despawn rate in merge check (#6428)
Dieser Commit ist enthalten in:
Ursprung
18d1602724
Commit
0b46fb1e5a
19
patches/server/0749-Respect-despawn-rate-in-item-merge-check.patch
Normale Datei
19
patches/server/0749-Respect-despawn-rate-in-item-merge-check.patch
Normale Datei
@ -0,0 +1,19 @@
|
|||||||
|
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) {
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren