From 85f21d1be167acff614875b85b3a5f19c160ff93 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sat, 11 Jan 2025 18:41:51 +0800 Subject: [PATCH] Merge Paper #11945 for temporary hooper behavior fix A hopper optimization fix on Paper's pr : https://github.com/PaperMC/Paper/pull/11945 --- ...rge-Paper-11945-for-temporary-hooper-behavior-fix.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/patches/server/0027-Merge-Paper-11945-for-temporary-hooper-behavior-fix.patch b/patches/server/0027-Merge-Paper-11945-for-temporary-hooper-behavior-fix.patch index c9415f0..23bc9e9 100644 --- a/patches/server/0027-Merge-Paper-11945-for-temporary-hooper-behavior-fix.patch +++ b/patches/server/0027-Merge-Paper-11945-for-temporary-hooper-behavior-fix.patch @@ -6,16 +6,17 @@ Subject: [PATCH] Merge Paper #11945 for temporary hooper behavior fix A hopper optimization fix on Paper's pr : https://github.com/PaperMC/Paper/pull/11945 diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java -index 44aae845da6cd34fc00e0c71795d6f610679bd4b..f0c2dae36d944f769082904301bcba91f2d0895f 100644 +index 44aae845da6cd34fc00e0c71795d6f610679bd4b..df56451927d049c1baa5cd43ed0c25a3837474ec 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java -@@ -764,8 +764,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen +@@ -764,8 +764,8 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen } else if (HopperBlockEntity.canMergeItems(itemstack1, stack)) { int j = Math.min(stack.getMaxStackSize(), to.getMaxStackSize()) - itemstack1.getCount(); // Paper - Make hoppers respect inventory max stack size int k = Math.min(stack.getCount(), j); - - stack.shrink(k); -+ stack.copy(true).shrink(k); // Paper - Perf: Optimize Hoppers ++ stack = stack.copy(true); // Paper - Perf: Optimize Hoppers ++ stack.shrink(k); // Paper - Perf: Optimize Hoppers itemstack1.grow(k); flag = k > 0; }