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

25 lines
1.1 KiB
Diff
Raw Normal View History

From 5abcca34e2d2e1667c9940c92bbee26f4bbba795 Mon Sep 17 00:00:00 2001
2019-12-12 00:43:22 +01:00
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 fcc1c0993..5f46c7f86 100644
2019-12-12 00:43:22 +01:00
--- 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.25.0.windows.1
2019-12-12 00:43:22 +01:00