Avoid item merge if stack size above max stack size (#1217)
This commit is contained in:
parent
bf21060ad9
commit
ab5c87e570
2 changed files with 26 additions and 0 deletions
|
@ -33,4 +33,5 @@ MiniDigger <admin@minidigger.me>
|
||||||
Brokkonaut <hannos17@gmx.de>
|
Brokkonaut <hannos17@gmx.de>
|
||||||
vemacs <d@nkmem.es>
|
vemacs <d@nkmem.es>
|
||||||
stonar96 <minecraft.stonar96@gmail.com>
|
stonar96 <minecraft.stonar96@gmail.com>
|
||||||
|
Hugo Manrique <hugmanrique@gmail.com>
|
||||||
```
|
```
|
||||||
|
|
|
@ -0,0 +1,25 @@
|
||||||
|
From 311e9503ab54d720ccf3304c144ea85fb9e4ca93 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 0b7fc327..099bc755 100644
|
||||||
|
--- a/src/main/java/net/minecraft/server/EntityItem.java
|
||||||
|
+++ b/src/main/java/net/minecraft/server/EntityItem.java
|
||||||
|
@@ -177,6 +177,11 @@ public class EntityItem extends Entity implements HopperPusher {
|
||||||
|
// Spigot end
|
||||||
|
|
||||||
|
private void x() {
|
||||||
|
+ // 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();
|
||||||
|
--
|
||||||
|
2.18.0.windows.1
|
||||||
|
|
Loading…
Reference in a new issue