Compare commits

..

3 Commits

Author SHA1 Message Date
MrHua269
f3e8f024a7 Switch dev/1.21.4 to ver/1.21.4 2025-01-11 22:32:31 +08:00
MrHua269
85f21d1be1 Merge Paper #11945 for temporary hooper behavior fix
A hopper optimization fix on Paper's pr : https://github.com/PaperMC/Paper/pull/11945
2025-01-11 18:46:28 +08:00
MrHua269
c0f20000cf Merge Paper #11945 for temporary hooper behavior fix
A hopper optimization fix on Paper's pr : https://github.com/PaperMC/Paper/pull/11945
2025-01-11 18:41:51 +08:00
34 changed files with 26 additions and 4 deletions

View File

@@ -1,10 +1,10 @@
name: Luminol CI - dev/1.21.4
name: Luminol CI - ver/1.21.4
on:
push:
branches: [ "dev/1.21.4" ]
branches: [ "ver/1.21.4" ]
pull_request:
branches: [ "dev/1.21.4" ]
branches: [ "ver/1.21.4" ]
permissions: write-all

View File

@@ -10,4 +10,4 @@ org.gradle.jvmargs = -Xmx3G
mcVersion = 1.21.4
GroupMCV = 1.21
preVersion = true
preVersion = false

View File

@@ -0,0 +1,22 @@
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..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,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 = stack.copy(true); // Paper - Perf: Optimize Hoppers
+ stack.shrink(k); // Paper - Perf: Optimize Hoppers
itemstack1.grow(k);
flag = k > 0;
}