25 lines
1.0 KiB
Diff
25 lines
1.0 KiB
Diff
|
From e21c5266e93f3fb2d2400ea7fb2be5729f267837 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 fcc1c0993..5f46c7f86 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.17.1
|
||
|
|
|