From 0edef40fb8ea590b8a2db365016c780e8554fa68 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 5efcc50ab9..e5c9bac88a 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -170,6 +170,10 @@ public class EntityItem extends Entity {
 
     private void mergeNearby() {
         if (this.w()) {
+            // 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.26.2