From b08e72a37c9658bb63180943bce37e4187f90bd6 Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Thu, 29 Sep 2022 05:42:00 +0200
Subject: [PATCH] Fix place_param2 of leaves to not conflict with biomes ids

---
 mods/ITEMS/mcl_core/functions.lua               |   2 +-
 .../textures/mcl_core_palette_grass.png         | Bin 248 -> 186 bytes
 mods/MAPGEN/mcl_biomes/init.lua                 |   6 +++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mods/ITEMS/mcl_core/functions.lua b/mods/ITEMS/mcl_core/functions.lua
index f5132d74b..403ed1dc6 100644
--- a/mods/ITEMS/mcl_core/functions.lua
+++ b/mods/ITEMS/mcl_core/functions.lua
@@ -1401,7 +1401,7 @@ minetest.register_abm({
 			return
 		end
 		local n0 = minetest.get_node(p0)
-		if n0.param2 ~= 0 then
+		if n0.param2 ~= 1 then
 			-- Prevent leafdecay for player-placed leaves.
 			-- param2 is set to 1 after it was placed by the player
 			return
diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_palette_grass.png b/mods/ITEMS/mcl_core/textures/mcl_core_palette_grass.png
index 116d0cb86724e98a0a09e33133a7f8c512fc47e7..31b540fa1040ccfa2595e2a3aaf6ab6113452d95 100644
GIT binary patch
delta 158
zcmV;P0Ac_50lEQ@B!7WPL_t(I%k9WN3W87oz~SHPJrj{=aPtNc7_>TsTSsW^0F7S5
z<1{t}-XKAoZD>*Q4=9h<79FACed8xC_tfmQrf8M`^xhkPTv0oQU*Rkm1I_i-5w92D
zSM4-_ba|MHQyl^l7>Iy*tGIO~08a(9u*n-Z?ntD|`H%@L%NP0+A65Ay3W<klZ~y=R
M07*qoM6N<$g8a)wfdBvi

delta 220
zcmdnR_=9nRN<CYWx4R1i82ohJT@Pe%7I;J!Gca%qgD@k*tT_@uLG}_)Usv|WJObi+
z#wo!|?gE8cJzX3_EKa{YW60GMz|ipU|I6Tw9PMWL0!~iZ;vYC-4_#bsYQ=fi!Esh;
zL7)-q(~nY38RfP2fAH`3==O=9vglPT!@Yl@-G6Hq6q@`$6lx$Z`aSQ7RK$M0_Ee_Z
zi?8_S`EuMia6~df+0*VC!xkZl2VY(&c5>dC%OH?BabxRIx3mPdv=3hyd+#Y1R&PF&
P4f2AgtDnm{r-UW|haps7

diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua
index 38003535a..4f94f38f2 100644
--- a/mods/MAPGEN/mcl_biomes/init.lua
+++ b/mods/MAPGEN/mcl_biomes/init.lua
@@ -1110,7 +1110,7 @@ local function register_biomes()
 		humidity_point = 36,
 		heat_point = 79,
 		_mcl_biome_type = "hot",
-		_mcl_palette_index = 1,
+		_mcl_palette_index = 30,
 	})
 	minetest.register_biome({
 		name = "Savanna_beach",
@@ -1125,7 +1125,7 @@ local function register_biomes()
 		humidity_point = 36,
 		heat_point = 79,
 		_mcl_biome_type = "hot",
-		_mcl_palette_index = 1,
+		_mcl_palette_index = 30,
 	})
 	minetest.register_biome({
 		name = "Savanna_ocean",
@@ -1140,7 +1140,7 @@ local function register_biomes()
 		humidity_point = 36,
 		heat_point = 79,
 		_mcl_biome_type = "hot",
-		_mcl_palette_index = 1,
+		_mcl_palette_index = 30,
 	})
 
 	-- Savanna M