From 3ce03e2d23421952e40eda1c862796ea41b06f61 Mon Sep 17 00:00:00 2001 From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Date: Fri, 10 Jun 2022 16:15:38 +0200 Subject: [PATCH] Remove unneeded patch --- ...e-if-stack-size-above-max-stack-size.patch | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 patches/server/Avoid-item-merge-if-stack-size-above-max-stack-size.patch diff --git a/patches/server/Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/patches/server/Avoid-item-merge-if-stack-size-above-max-stack-size.patch deleted file mode 100644 index 92e1678e57..0000000000 --- a/patches/server/Avoid-item-merge-if-stack-size-above-max-stack-size.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Hugo Manrique -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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -@@ -0,0 +0,0 @@ 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 list = this.level.getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate(radius, radius - 0.5D, radius), (entityitem) -> {