diff --git a/gradle.properties b/gradle.properties index 38021f8..801bd40 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=org.galemc.gale version=1.20-R0.1-SNAPSHOT mcVersion=1.20 -paperRef=648c000fb2330ca1f9b7833a275e70f06c1fce83 +paperRef=3722877c3c16e4e88c45a5133ec7a0e9efdd1f92 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0032-Improve-container-checking-with-a-bitset.patch b/patches/server/0032-Improve-container-checking-with-a-bitset.patch index 51393c4..595751d 100644 --- a/patches/server/0032-Improve-container-checking-with-a-bitset.patch +++ b/patches/server/0032-Improve-container-checking-with-a-bitset.patch @@ -390,7 +390,7 @@ index a71414397bd45ee7bcacfeef0041d80dfa25f114..7743f185672e977520218c3ce6b8ddc9 @Override 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 93c13cb36024370f6ec71137cebca254af2b3b61..9849e784f4fc92368779134f8e10fa2f290a086b 100644 +index a8a26a0a37a08b6bbeb5a1fde417d6f448d3c79f..fd1ea9473f228bc2f96f3dc288b38616807b8edd 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 @@ -47,7 +47,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen @@ -485,7 +485,7 @@ index 93c13cb36024370f6ec71137cebca254af2b3b61..9849e784f4fc92368779134f8e10fa2f if (itemstack1.isEmpty()) { // Spigot start - SPIGOT-6693, InventorySubcontainer#setItem -@@ -813,7 +839,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen +@@ -831,7 +857,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen @Override protected void setItems(NonNullList list) { diff --git a/patches/server/0051-Reduce-hopper-item-checks.patch b/patches/server/0051-Reduce-hopper-item-checks.patch index b553b91..1222776 100644 --- a/patches/server/0051-Reduce-hopper-item-checks.patch +++ b/patches/server/0051-Reduce-hopper-item-checks.patch @@ -119,7 +119,7 @@ index a05acf709735b40ca86f978508c63a86065fd405..3752b4ba7fb0d680d4b4a61bf44d54d5 double getLevelY(); 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 1eb9326a0defaf412d94eac2e3b3e1fd855ba24c..f28e264c5975e94d284bdbd9646f3154a0e223ab 100644 +index fd1ea9473f228bc2f96f3dc288b38616807b8edd..37871156bf18c537de13412a74c9eaff9b776aa6 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 @@ -11,6 +11,7 @@ import net.minecraft.core.Direction; @@ -155,7 +155,7 @@ index 1eb9326a0defaf412d94eac2e3b3e1fd855ba24c..f28e264c5975e94d284bdbd9646f3154 } @io.papermc.paper.annotation.DoNotUse // Paper - method unused as logic is inlined above -@@ -805,6 +808,31 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen +@@ -823,6 +826,31 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen return first.getCount() < first.getMaxStackSize() && first.is(second.getItem()) && first.getDamageValue() == second.getDamageValue() && ((first.isEmpty() && second.isEmpty()) || java.util.Objects.equals(first.getTag(), second.getTag())); // Paper - used to return true for full itemstacks?! }