mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-30 12:57:41 +01:00
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 430809523d02801088c247e11bce351a99b8bc05..df5064e69f10bb366572e5f1da197514f3067faf 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
|
@@ -222,6 +222,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 - 0.5D, radius), (entityitem) -> {
|