22 lines
1.2 KiB
Diff
22 lines
1.2 KiB
Diff
|
From 0000000000000000000000000000000000000000 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/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
||
|
|
index de69f7c3c0ee1e74682b0db91bdaae09175690e9..70f719ba3c68c8e9414e6b4bc68002f7c962e2b9 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
||
|
|
@@ -208,6 +208,10 @@ public class ItemEntity extends Entity {
|
||
|
|
|
||
|
|
private void mergeWithNeighbours() {
|
||
|
|
if (this.isMergable()) {
|
||
|
|
+ // Paper start - avoid item merge if stack size above max stack size
|
||
|
|
+ ItemStack stack = getItem();
|
||
|
|
+ if (stack.getCount() >= stack.getMaxStackSize()) return;
|
||
|
|
+ // Paper end
|
||
|
|
// Spigot start
|
||
|
|
double radius = level.spigotConfig.itemMerge;
|
||
|
|
List<ItemEntity> list = this.level.getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate(radius, radius, radius), (entityitem) -> {
|