2018-07-23 16:39:55 +08:00
|
|
|
From 7981e61b9a6dddd2e982f421b94e98e2d146eab2 Mon Sep 17 00:00:00 2001
|
2018-07-19 23:51:55 +08: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
|
2018-07-23 16:39:55 +08:00
|
|
|
index d232bab745..b0f22f8f09 100644
|
2018-07-19 23:51:55 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityItem.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityItem.java
|
2018-07-20 03:23:18 +08:00
|
|
|
@@ -173,6 +173,10 @@ public class EntityItem extends Entity {
|
|
|
|
}
|
2018-07-19 23:51:55 +08:00
|
|
|
|
2018-07-20 03:23:18 +08:00
|
|
|
private void v() {
|
2018-07-19 23:51:55 +08:00
|
|
|
+ // 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();
|
|
|
|
--
|
2018-07-20 03:23:18 +08:00
|
|
|
2.18.0
|
2018-07-19 23:51:55 +08:00
|
|
|
|