Merge Paper #11945 for temporary hooper behavior fix

A hopper optimization fix on Paper's pr : PaperMC/Paper#11945
LuminolMC · Jan 11, 2025 · c0f2000 · c0f2000
1 parent b33e2fc
commit c0f2000
Show file tree

Hide file tree

Showing 32 changed files with 21 additions and 0 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
@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrHua269 <wangxyper@163.com>
+Date: Sat, 11 Jan 2025 18:41:11 +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
+
+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
+--- 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
+             } 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
+                 itemstack1.grow(k);
+                 flag = k > 0;
+             }
diff --git a/...aiiju-Don-t-pathfind-outside-region.patch → ...aiiju-Don-t-pathfind-outside-region.patch b/...aiiju-Don-t-pathfind-outside-region.patch → ...aiiju-Don-t-pathfind-outside-region.patch
diff --git a/...ju-Vanilla-end-portal-teleportation.patch → ...ju-Vanilla-end-portal-teleportation.patch b/...ju-Vanilla-end-portal-teleportation.patch → ...ju-Vanilla-end-portal-teleportation.patch
diff --git a/...iju-Entity-tick-and-removal-limiter.patch → ...iju-Entity-tick-and-removal-limiter.patch b/...iju-Entity-tick-and-removal-limiter.patch → ...iju-Entity-tick-and-removal-limiter.patch
diff --git a/...erver/0030-Petal-Reduce-sensor-work.patch → ...erver/0031-Petal-Reduce-sensor-work.patch b/...erver/0030-Petal-Reduce-sensor-work.patch → ...erver/0031-Petal-Reduce-sensor-work.patch
diff --git a/...Cache-climbing-check-for-activation.patch → ...Cache-climbing-check-for-activation.patch b/...Cache-climbing-check-for-activation.patch → ...Cache-climbing-check-for-activation.patch
diff --git a/...erfish-Reduce-chunk-loading-lookups.patch → ...erfish-Reduce-chunk-loading-lookups.patch b/...erfish-Reduce-chunk-loading-lookups.patch → ...erfish-Reduce-chunk-loading-lookups.patch
diff --git a/...per-6045-block-goal-shouldn-t-load-.patch → ...per-6045-block-goal-shouldn-t-load-.patch b/...per-6045-block-goal-shouldn-t-load-.patch → ...per-6045-block-goal-shouldn-t-load-.patch
diff --git a/...ish-Reduce-projectile-chunk-loading.patch → ...ish-Reduce-projectile-chunk-loading.patch b/...ish-Reduce-projectile-chunk-loading.patch → ...ish-Reduce-projectile-chunk-loading.patch
diff --git a/...heck-for-spooky-season-once-an-hour.patch → ...heck-for-spooky-season-once-an-hour.patch b/...heck-for-spooky-season-once-an-hour.patch → ...heck-for-spooky-season-once-an-hour.patch
diff --git a/...036-Pufferfish-Optimize-suffocation.patch → ...037-Pufferfish-Optimize-suffocation.patch b/...036-Pufferfish-Optimize-suffocation.patch → ...037-Pufferfish-Optimize-suffocation.patch
diff --git a/...ferfish-Dynamic-Activation-of-Brain.patch → ...ferfish-Dynamic-Activation-of-Brain.patch b/...ferfish-Dynamic-Activation-of-Brain.patch → ...ferfish-Dynamic-Activation-of-Brain.patch
diff --git a/...le-goal-selector-during-inactive-ti.patch → ...le-goal-selector-during-inactive-ti.patch b/...le-goal-selector-during-inactive-ti.patch → ...le-goal-selector-during-inactive-ti.patch
diff --git a/...rver/0039-Pufferfish-SIMD-Utilities.patch → ...rver/0040-Pufferfish-SIMD-Utilities.patch b/...rver/0039-Pufferfish-SIMD-Utilities.patch → ...rver/0040-Pufferfish-SIMD-Utilities.patch
diff --git a/patches/server/0040-Pufferfish-Sentry.patch → patches/server/0041-Pufferfish-Sentry.patch b/patches/server/0040-Pufferfish-Sentry.patch → patches/server/0041-Pufferfish-Sentry.patch
diff --git a/...le-Variable-entity-wake-up-duration.patch → ...le-Variable-entity-wake-up-duration.patch b/...le-Variable-entity-wake-up-duration.patch → ...le-Variable-entity-wake-up-duration.patch
diff --git a/...er/0042-Gale-Optimize-sun-burn-tick.patch → ...er/0043-Gale-Optimize-sun-burn-tick.patch b/...er/0042-Gale-Optimize-sun-burn-tick.patch → ...er/0043-Gale-Optimize-sun-burn-tick.patch
diff --git a/...43-Gale-Use-platform-math-functions.patch → ...44-Gale-Use-platform-math-functions.patch b/...43-Gale-Use-platform-math-functions.patch → ...44-Gale-Use-platform-math-functions.patch
diff --git a/...0044-Gale-Optimize-noise-generation.patch → ...0045-Gale-Optimize-noise-generation.patch b/...0044-Gale-Optimize-noise-generation.patch → ...0045-Gale-Optimize-noise-generation.patch
diff --git a/...a-and-Optional-allocation-in-Entity.patch → ...a-and-Optional-allocation-in-Entity.patch b/...a-and-Optional-allocation-in-Entity.patch → ...a-and-Optional-allocation-in-Entity.patch
diff --git a/...ttle-tracker-map-with-optimized-col.patch → ...ttle-tracker-map-with-optimized-col.patch b/...ttle-tracker-map-with-optimized-col.patch → ...ttle-tracker-map-with-optimized-col.patch
diff --git a/...kip-entity-move-if-movement-is-zero.patch → ...kip-entity-move-if-movement-is-zero.patch b/...kip-entity-move-if-movement-is-zero.patch → ...kip-entity-move-if-movement-is-zero.patch
diff --git a/...parkly-Paper-Optimize-canSee-checks.patch → ...parkly-Paper-Optimize-canSee-checks.patch b/...parkly-Paper-Optimize-canSee-checks.patch → ...parkly-Paper-Optimize-canSee-checks.patch
diff --git a/...-MapItem-update-if-the-map-does-not.patch → ...-MapItem-update-if-the-map-does-not.patch b/...-MapItem-update-if-the-map-does-not.patch → ...-MapItem-update-if-the-map-does-not.patch
diff --git a/...-distanceToSqr-call-in-ServerEntity.patch → ...-distanceToSqr-call-in-ServerEntity.patch b/...-distanceToSqr-call-in-ServerEntity.patch → ...-distanceToSqr-call-in-ServerEntity.patch
diff --git a/...I-and-display-of-chunkhot-in-tpsbar.patch → ...I-and-display-of-chunkhot-in-tpsbar.patch b/...I-and-display-of-chunkhot-in-tpsbar.patch → ...I-and-display-of-chunkhot-in-tpsbar.patch
diff --git a/...052-Leaf-Skip-event-if-no-listeners.patch → ...053-Leaf-Skip-event-if-no-listeners.patch b/...052-Leaf-Skip-event-if-no-listeners.patch → ...053-Leaf-Skip-event-if-no-listeners.patch
diff --git a/...Secure-Seed-with-SecureSeed-command.patch → ...Secure-Seed-with-SecureSeed-command.patch b/...Secure-Seed-with-SecureSeed-command.patch → ...Secure-Seed-with-SecureSeed-command.patch
diff --git a/...4-Purpur-use-alternative-keep-alive.patch → ...5-Purpur-use-alternative-keep-alive.patch b/...4-Purpur-use-alternative-keep-alive.patch → ...5-Purpur-use-alternative-keep-alive.patch
diff --git a/...-start-tick-and-finished-tick-event.patch → ...-start-tick-and-finished-tick-event.patch b/...-start-tick-and-finished-tick-event.patch → ...-start-tick-and-finished-tick-event.patch
diff --git a/patches/server/0056-Fix-MC-2025.patch → patches/server/0057-Fix-MC-2025.patch b/patches/server/0056-Fix-MC-2025.patch → patches/server/0057-Fix-MC-2025.patch
diff --git a/...er/0057-FoliaPR-Add-TPS-From-Region.patch → ...er/0058-FoliaPR-Add-TPS-From-Region.patch b/...er/0057-FoliaPR-Add-TPS-From-Region.patch → ...er/0058-FoliaPR-Add-TPS-From-Region.patch