diff --git a/gradle.properties b/gradle.properties index 3c29c7309..475a4b730 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ group = org.purpurmc.purpur mcVersion = 26.1.2 apiVersion = 26.1.2 channel=EXPERIMENTAL -paperCommit = 66d3bbed3878387649d4b9f72e78780e33b2d85d +paperCommit = 6bac3c95bf36bb1e8a309ff1b5062a8b2b7de07f org.gradle.configuration-cache = true org.gradle.caching = true diff --git a/purpur-server/minecraft-patches/features/0003-Barrels-and-enderchests-6-rows.patch b/purpur-server/minecraft-patches/features/0003-Barrels-and-enderchests-6-rows.patch index 36b307ce8..d2c0d15a2 100644 --- a/purpur-server/minecraft-patches/features/0003-Barrels-and-enderchests-6-rows.patch +++ b/purpur-server/minecraft-patches/features/0003-Barrels-and-enderchests-6-rows.patch @@ -157,7 +157,7 @@ index 24a2c411da0ebbb7f97d621bb76ff686621f9aae..7ba9e8f6414246b589ff423fac63f805 public BlockEntity newBlockEntity(final BlockPos worldPosition, final BlockState blockState) { return new EnderChestBlockEntity(worldPosition, blockState); diff --git a/net/minecraft/world/level/block/entity/BarrelBlockEntity.java b/net/minecraft/world/level/block/entity/BarrelBlockEntity.java -index 9eb6cb86ff70f04863cae3def1006f82bcb4fa6b..79ca37b3e4ed98139b8adbdccd39d597315c7f99 100644 +index da5fdf77dd26d97c8b92bac9a6af8d922c31eb9c..c788746268d7317d8d4a7220fa9c71f5d04eedd6 100644 --- a/net/minecraft/world/level/block/entity/BarrelBlockEntity.java +++ b/net/minecraft/world/level/block/entity/BarrelBlockEntity.java @@ -60,7 +60,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity { @@ -178,7 +178,7 @@ index 9eb6cb86ff70f04863cae3def1006f82bcb4fa6b..79ca37b3e4ed98139b8adbdccd39d597 public final ContainerOpenersCounter openersCounter = new ContainerOpenersCounter() { { Objects.requireNonNull(BarrelBlockEntity.this); -@@ -116,7 +125,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity { +@@ -123,7 +132,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity { @Override public int getContainerSize() { @@ -196,7 +196,7 @@ index 9eb6cb86ff70f04863cae3def1006f82bcb4fa6b..79ca37b3e4ed98139b8adbdccd39d597 } @Override -@@ -136,7 +154,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity { +@@ -143,7 +161,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity { @Override protected AbstractContainerMenu createMenu(final int containerId, final Inventory inventory) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch index 088ee7197..bfd5d59ec 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch @@ -9,7 +9,7 @@ private static final int MIN_TICKS_BEFORE_REENTERING_HIVE = 400; private static final int MIN_OCCUPATION_TICKS_NECTAR = 2400; public static final int MIN_OCCUPATION_TICKS_NECTARLESS = 600; -@@ -156,11 +_,33 @@ +@@ -157,11 +_,33 @@ return spawned; } @@ -43,7 +43,7 @@ // Paper start - Add EntityBlockStorage clearEntities public void clearBees() { this.stored.clear(); -@@ -399,8 +_,8 @@ +@@ -400,8 +_,8 @@ registration.register(DebugSubscriptions.BEE_HIVES, () -> DebugHiveInfo.pack(this)); }