From 45821f2511703aaf8afc57ca59a6cb761ad8e93b Mon Sep 17 00:00:00 2001
From: SoSeDiK <mrsosedik@gmail.com>
Date: Tue, 13 Dec 2022 17:01:54 +0200
Subject: [PATCH] Fix locateNearestBiome nullability check (#8662)

---
 patches/server/More-World-API.patch | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/patches/server/More-World-API.patch b/patches/server/More-World-API.patch
index f5e8e79aaf0..43b21c0be92 100644
--- a/patches/server/More-World-API.patch
+++ b/patches/server/More-World-API.patch
@@ -21,8 +21,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    @Override
 +    public Location locateNearestBiome(Location origin, Biome biome, int radius, int step) {
 +        BlockPos originPos = new BlockPos(origin.getX(), origin.getY(), origin.getZ());
-+        BlockPos nearest = getHandle().findClosestBiome3d( holder -> holder.is(CraftNamespacedKey.toMinecraft(biome.getKey())), originPos, radius, step, step).getFirst();
-+        return (nearest == null) ? null : new Location(this, nearest.getX(), nearest.getY(), nearest.getZ());
++        Pair<BlockPos, Holder<net.minecraft.world.level.biome.Biome>> pair = getHandle().findClosestBiome3d(holder -> holder.is(CraftNamespacedKey.toMinecraft(biome.getKey())), originPos, radius, step, step);
++        if (pair == null) {
++            return null;
++        }
++        BlockPos nearest = pair.getFirst();
++        return new Location(this, nearest.getX(), nearest.getY(), nearest.getZ());
 +    }
 +
 +    @Override