mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 15:08:27 +02:00
25 lines
1.0 KiB
Diff
25 lines
1.0 KiB
Diff
From d8d88222f6045eb3afdb50a693eec564b1825252 Mon Sep 17 00:00:00 2001
|
|
From: Hugo Manrique <hugmanrique@gmail.com>
|
|
Date: Mon, 16 Jul 2018 12:42:20 +0200
|
|
Subject: [PATCH] Avoid item merge if stack size above max stack size
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
|
|
index c582c6711..c5fefa060 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityItem.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityItem.java
|
|
@@ -166,6 +166,10 @@ public class EntityItem extends Entity {
|
|
}
|
|
|
|
private void mergeNearby() {
|
|
+ // Paper start - avoid item merge if stack size above max stack size
|
|
+ ItemStack stack = getItemStack();
|
|
+ if (stack.getCount() >= stack.getMaxStackSize()) return;
|
|
+ // Paper end
|
|
// Spigot start
|
|
double radius = world.spigotConfig.itemMerge;
|
|
List<EntityItem> list = this.world.a(EntityItem.class, this.getBoundingBox().grow(radius, radius, radius), (entityitem) -> {
|
|
--
|
|
2.21.0
|
|
|