From 60f164d46ac5a8377e205a8acb3eb8022a124d73 Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Tue, 14 Jun 2022 12:32:08 +0200
Subject: [PATCH] Fix horse and wolf spawning biomes

---
 mods/ENTITIES/mobs_mc/horse.lua | 47 ++++++++-------------------------
 mods/ENTITIES/mobs_mc/wolf.lua  | 27 +++++++------------
 2 files changed, 21 insertions(+), 53 deletions(-)

diff --git a/mods/ENTITIES/mobs_mc/horse.lua b/mods/ENTITIES/mobs_mc/horse.lua
index d423c124c..20ff8b718 100644
--- a/mods/ENTITIES/mobs_mc/horse.lua
+++ b/mods/ENTITIES/mobs_mc/horse.lua
@@ -542,41 +542,14 @@ mcl_mobs:spawn_specific(
 "ground",
 {
 	"flat",
-	"IcePlainsSpikes",
-	"ColdTaiga",
-	"ColdTaiga_beach",
-	"ColdTaiga_beach_water",
-	"MegaTaiga",
-	"MegaSpruceTaiga",
-	"ExtremeHills",
-	"ExtremeHills_beach",
-	"ExtremeHillsM",
-	"ExtremeHills+",
-	"ExtremeHills+_snowtop",
-	"StoneBeach",
 	"Plains",
 	"Plains_beach",
 	"SunflowerPlains",
-	"Taiga",
-	"Taiga_beach",
-	"Forest",
-	"Forest_beach",
-	"FlowerForest",
-	"FlowerForest_beach",
-	"BirchForest",
-	"BirchForestM",
-	"RoofedForest",
 	"Savanna",
 	"Savanna_beach",
 	"SavannaM",
-	"Jungle",
-	"Jungle_shore",
-	"JungleM",
-	"JungleM_shore",
-	"JungleEdge",
-	"JungleEdgeM",
-	"Swampland",
-	"Swampland_shore"
+	"Savanna_beach",
+	"Plains_beach",
 },
 0,
 minetest.LIGHT_MAX+1,
@@ -586,18 +559,20 @@ minetest.LIGHT_MAX+1,
 mobs_mc.water_level+3,
 mcl_vars.mg_overworld_max)
 
-
 mcl_mobs:spawn_specific(
 "mobs_mc:donkey",
 "overworld",
 "ground",
 {
-"Mesa",
-"MesaPlateauFM_grasstop",
-"MesaPlateauF",
-"MesaPlateauFM",
-"MesaPlateauF_grasstop",
-"MesaBryce",
+	"flat",
+	"Plains",
+	"Plains_beach",
+	"SunflowerPlains",
+	"Savanna",
+	"Savanna_beach",
+	"SavannaM",
+	"Savanna_beach",
+	"Plains_beach",
 },
 0,
 minetest.LIGHT_MAX+1,
diff --git a/mods/ENTITIES/mobs_mc/wolf.lua b/mods/ENTITIES/mobs_mc/wolf.lua
index f2232c397..d875bebf9 100644
--- a/mods/ENTITIES/mobs_mc/wolf.lua
+++ b/mods/ENTITIES/mobs_mc/wolf.lua
@@ -232,29 +232,22 @@ dog.on_rightclick = function(self, clicker)
 end
 
 mcl_mobs:register_mob("mobs_mc:dog", dog)
-
 -- Spawn
 mcl_mobs:spawn_specific(
 "mobs_mc:wolf",
 "overworld",
 "ground",
 {
-"FlowerForest",
-"Swampland",
-"Taiga",
-"ExtremeHills",
-"BirchForest",
-"MegaSpruceTaiga",
-"MegaTaiga",
-"ExtremeHills+",
-"Forest",
-"Plains",
-"ColdTaiga",
-"SunflowerPlains",
-"RoofedForest",
-"MesaPlateauFM_grasstop",
-"ExtremeHillsM",
-"BirchForestM",
+	"Taiga",
+	"MegaSpruceTaiga",
+	"MegaTaiga",
+	"Forest",
+	"ColdTaiga",
+	"FlowerForest_beach",
+	"Forest_beach",
+	"ColdTaiga_beach_water",
+	"Taiga_beach",
+	"ColdTaiga_beach",
 },
 0,
 minetest.LIGHT_MAX+1,