diff --git a/patches/api/Fix-upstream-javadocs.patch b/patches/api/Fix-upstream-javadocs.patch
index bf79f5f215..cac6e00b37 100644
--- a/patches/api/Fix-upstream-javadocs.patch
+++ b/patches/api/Fix-upstream-javadocs.patch
@@ -18,6 +18,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       *
       * @return an array containing all previous players
       */
+diff --git a/src/main/java/org/bukkit/ChunkSnapshot.java b/src/main/java/org/bukkit/ChunkSnapshot.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/ChunkSnapshot.java
++++ b/src/main/java/org/bukkit/ChunkSnapshot.java
+@@ -0,0 +0,0 @@ public interface ChunkSnapshot {
+      * Get raw biome temperature at given coordinates
+      *
+      * @param x X-coordinate (0-15)
+-     * @param y Y-coordinate (0-15)
++     * @param y Y-coordinate (world minHeight (inclusive) - world maxHeight (exclusive))
+      * @param z Z-coordinate (0-15)
+      * @return temperature at given coordinate
+      */
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/Server.java
diff --git a/patches/server/Fix-chunk-snapshot-biome-getter.patch b/patches/server/Fix-chunk-snapshot-biome-getter.patch
new file mode 100644
index 0000000000..c85721204b
--- /dev/null
+++ b/patches/server/Fix-chunk-snapshot-biome-getter.patch
@@ -0,0 +1,29 @@
+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));
+     }
+