diff --git a/patches/server/Fix-chunk-snapshot-biome-getter.patch b/patches/server/Fix-chunk-snapshot-biome-getter.patch
deleted file mode 100644
index c85721204b..0000000000
--- a/patches/server/Fix-chunk-snapshot-biome-getter.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
-Date: Sat, 10 Dec 2022 13:01:52 +0100
-Subject: [PATCH] Fix chunk snapshot biome getter
-
-Fixes SPIGOT-7188: https://hub.spigotmc.org/jira/browse/SPIGOT-7188
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
-@@ -0,0 +0,0 @@ public class CraftChunkSnapshot implements ChunkSnapshot {
-         Preconditions.checkState(this.biome != null, "ChunkSnapshot created without biome. Please call getSnapshot with includeBiome=true");
-         this.validateChunkCoordinates(x, y, z);
- 
--        PalettedContainerRO<Holder<net.minecraft.world.level.biome.Biome>> biome = this.biome[this.getSectionIndex(y >> 2)];
-+        PalettedContainerRO<Holder<net.minecraft.world.level.biome.Biome>> biome = this.biome[this.getSectionIndex(y)]; // Paper
-         return CraftBlock.biomeBaseToBiome(biomeRegistry, biome.get(x >> 2, (y & 0xF) >> 2, z >> 2));
-     }
- 
-@@ -0,0 +0,0 @@ public class CraftChunkSnapshot implements ChunkSnapshot {
-         Preconditions.checkState(this.biome != null, "ChunkSnapshot created without biome. Please call getSnapshot with includeBiome=true");
-         this.validateChunkCoordinates(x, y, z);
- 
--        PalettedContainerRO<Holder<net.minecraft.world.level.biome.Biome>> biome = this.biome[this.getSectionIndex(y >> 2)];
-+        PalettedContainerRO<Holder<net.minecraft.world.level.biome.Biome>> biome = this.biome[this.getSectionIndex(y)]; // Paper
-         return biome.get(x >> 2, (y & 0xF) >> 2, z >> 2).value().getTemperature(new BlockPos((this.x << 4) | x, y, (this.z << 4) | z));
-     }
- 
diff --git a/work/Bukkit b/work/Bukkit
index 2c64d8c4a8..9153f77e75 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 2c64d8c4a880c6aec8ee8ce3abdd0238b0e0d8a3
+Subproject commit 9153f77e75057c0d0be267de6e0dca89e487625f
diff --git a/work/CraftBukkit b/work/CraftBukkit
index f92c945173..e142fb9fd3 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit f92c945173a83c754203f372cb0111780c24b540
+Subproject commit e142fb9fd3784080c43e025c32d8306881fee4ca