testserver/Spigot-Server-Patches/0289-Avoid-item-merge-if-st...

25 lines
1009 B
Diff
Raw Normal View History

From a5cceec9307d5362b29f671904840bdd61cd9abb 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 0b4cab0af..7264773ef 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
2018-07-19 19:23:18 +00:00
@@ -173,6 +173,10 @@ public class EntityItem extends Entity {
}
2018-07-19 19:23:18 +00: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();
--
2.20.0