26 lines
1.0 KiB
Diff
26 lines
1.0 KiB
Diff
|
From 311e9503ab54d720ccf3304c144ea85fb9e4ca93 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 0b7fc327..099bc755 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityItem.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityItem.java
|
||
|
|
@@ -177,6 +177,11 @@ public class EntityItem extends Entity implements HopperPusher {
|
||
|
|
// Spigot end
|
||
|
|
|
||
|
|
private void x() {
|
||
|
|
+ // 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.18.0.windows.1
|
||
|
|
|