From 4578b0fed4c8ead70a9074e43258e737aca66afd Mon Sep 17 00:00:00 2001
From: Frederik van der Els <fred@xpple.dev>
Date: Thu, 17 Apr 2025 21:52:21 +0200
Subject: [PATCH 1/2] Add `cherry_grove` to Stronghold biomes exclusion list

---
 finders.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/finders.c b/finders.c
index 783d5ecc..5f8f50ce 100644
--- a/finders.c
+++ b/finders.c
@@ -817,7 +817,7 @@ int isStrongholdBiome(int mc, int id)
         return 0;
     case mushroom_field_shore:
         return mc >= MC_1_13;
-    case stone_shore:
+    case stone_shore: // stony_shore
         return mc <= MC_1_17;
     case bamboo_jungle:
     case bamboo_jungle_hills:
@@ -825,6 +825,7 @@ int isStrongholdBiome(int mc, int id)
         return mc <= MC_1_15 || mc >= MC_1_18;
     case mangrove_swamp:
     case deep_dark:
+    case cherry_grove:
         return 0;
     default:
         return 1;

From 61c20e9b4f208274f1db987d6a965ad6825751b6 Mon Sep 17 00:00:00 2001
From: Frederik van der Els <fred@xpple.dev>
Date: Wed, 29 Oct 2025 14:56:27 +0100
Subject: [PATCH 2/2] Apply fix for MC-278965

---
 biomes.h  | 3 ++-
 finders.c | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/biomes.h b/biomes.h
index eaf85ff5..4ae85295 100644
--- a/biomes.h
+++ b/biomes.h
@@ -35,7 +35,8 @@ enum MCVersion
     MC_1_21_1,
     MC_1_21_3,
     MC_1_21_WD, // Winter Drop, version TBA
-    MC_1_21 = MC_1_21_WD,
+    MC_1_21_9,
+    MC_1_21 = MC_1_21_9,
     MC_NEWEST = MC_1_21,
 };
 
diff --git a/finders.c b/finders.c
index 5f8f50ce..a2204b09 100644
--- a/finders.c
+++ b/finders.c
@@ -823,9 +823,11 @@ int isStrongholdBiome(int mc, int id)
     case bamboo_jungle_hills:
         // simulate MC-199298
         return mc <= MC_1_15 || mc >= MC_1_18;
+    case cherry_grove:
+        // see MC-278965
+        return mc >= MC_1_21_9;
     case mangrove_swamp:
     case deep_dark:
-    case cherry_grove:
         return 0;
     default:
         return 1;