Paper/Spigot-Server-Patches/0292-Avoid-item-merge-if-stack-size-above-max-stack-size.patch

25 lines
1011 B
Diff
Raw Normal View History

From be48296836606dd109f71db805c9389d0c27268b 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 946e59753e..f596b4351b 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
2018-07-19 21:23:18 +02:00
@@ -173,6 +173,10 @@ public class EntityItem extends Entity {
}
2018-07-19 21:23:18 +02:00
private void v() {
+ // 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;
Iterator iterator = this.world.a(EntityItem.class, this.getBoundingBox().grow(radius, radius, radius)).iterator();
--
2018-07-19 21:23:18 +02:00
2.18.0