2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2019-12-11 23:43:22 +00: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
|
2020-05-06 09:48:49 +00:00
|
|
|
index 5efcc50ab9e8a99d88a9d2e7f15ecbcc4439b93e..e5c9bac88a59d52c9b2f05df3e4f373edbe009ca 100644
|
2019-12-11 23:43:22 +00: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) -> {
|
