From be2a8d705499b4ec6ace552ceaae1ad8aa4dd86c Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Sat, 25 Jun 2022 02:53:58 +0200
Subject: [PATCH] Structure transfer fixes

---
 mods/MAPGEN/mcl_structures/desert_temple.lua |  2 +-
 mods/MAPGEN/mcl_structures/igloo.lua         |  2 +-
 mods/MAPGEN/mcl_structures/jungle_temple.lua |  2 +-
 mods/MAPGEN/mcl_structures/ocean_ruins.lua   |  2 +-
 mods/MAPGEN/mcl_structures/witch_hut.lua     | 14 +++++++-------
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/mods/MAPGEN/mcl_structures/desert_temple.lua b/mods/MAPGEN/mcl_structures/desert_temple.lua
index ddacd83d2..272310802 100644
--- a/mods/MAPGEN/mcl_structures/desert_temple.lua
+++ b/mods/MAPGEN/mcl_structures/desert_temple.lua
@@ -34,7 +34,7 @@ end
 
 mcl_structures.register_structure("desert_temple",{
 	place_on = {"group:sand"},
-	fill_ratio = 0.01,
+	fill_ratio = 0.05,
 	flags = "place_center_x, place_center_z",
 	solid_ground = true,
 	make_foundation = true,
diff --git a/mods/MAPGEN/mcl_structures/igloo.lua b/mods/MAPGEN/mcl_structures/igloo.lua
index d364ec492..49e3c879a 100644
--- a/mods/MAPGEN/mcl_structures/igloo.lua
+++ b/mods/MAPGEN/mcl_structures/igloo.lua
@@ -130,7 +130,7 @@ mcl_structures.register_structure("igloo",{
 	place_on = {"mcl_core:snowblock","mcl_core:snow","group:grass_block_snow"},
 	fill_ratio = 0.01,
 	sidelen = 16,
-	chunk_probability = 4400,
+	chunk_probability = 250,
 	solid_ground = true,
 	make_foundation = true,
 	y_max = mcl_vars.mg_overworld_max,
diff --git a/mods/MAPGEN/mcl_structures/jungle_temple.lua b/mods/MAPGEN/mcl_structures/jungle_temple.lua
index aa5bf9412..d421ba5b0 100644
--- a/mods/MAPGEN/mcl_structures/jungle_temple.lua
+++ b/mods/MAPGEN/mcl_structures/jungle_temple.lua
@@ -19,7 +19,7 @@ mcl_structures.register_structure("jungle_temple",{
 		modpath.."/schematics/mcl_structures_jungle_temple_nice.mts",
 	},
 	loot = {
-		["mcl_chests:chest_small" ] ={{
+		["mcl_chests:trapped_chest_small" ] ={{
 			stacks_min = 2,
 			stacks_max = 6,
 			items = {
diff --git a/mods/MAPGEN/mcl_structures/ocean_ruins.lua b/mods/MAPGEN/mcl_structures/ocean_ruins.lua
index df0a740f9..0b609aee7 100644
--- a/mods/MAPGEN/mcl_structures/ocean_ruins.lua
+++ b/mods/MAPGEN/mcl_structures/ocean_ruins.lua
@@ -82,7 +82,7 @@ local cold = {
 	y_min = mcl_vars.mg_overworld_min,
 	y_max = -2,
 	biomes = cold_oceans,
-	chunk_probability = 256,
+	chunk_probability = 400,
 	sidelen = 20,
 	filenames = {
 		modpath.."/schematics/mcl_structures_ocean_ruins_cold_1.mts",
diff --git a/mods/MAPGEN/mcl_structures/witch_hut.lua b/mods/MAPGEN/mcl_structures/witch_hut.lua
index 68b1c6809..6a10e7a91 100644
--- a/mods/MAPGEN/mcl_structures/witch_hut.lua
+++ b/mods/MAPGEN/mcl_structures/witch_hut.lua
@@ -22,12 +22,12 @@ local function hut_placement_callback(pos,def,pr)
 	local hl = def.sidelen / 2
 	local p1 = vector.offset(pos,-hl,-hl,-hl)
 	local p2 = vector.offset(pos,hl,hl,hl)
-	local legs = minetest.find_nodes_in_area(p1, p2, "mcl_core:tree")
+	local legs = minetest.find_nodes_in_area(vector.offset(pos,-hl,0,-hl),vector.offset(pos,hl,0,hl), "mcl_core:tree")
 	local tree = {}
-	for i = 1, #legs do
-		while minetest.get_item_group(mcl_vars.get_node({x=legs[i].x, y=legs[i].y-1, z=legs[i].z}, true, 333333).name, "water") ~= 0 do
-			legs[i].y = legs[i].y - 1
-			table.insert(tree,legs[i])
+	for _,leg in pairs(legs) do
+		while minetest.get_item_group(mcl_vars.get_node(vector.offset(leg,0,-1,0), true, 333333).name, "water") ~= 0 do
+			leg = vector.offset(leg,0,-1,0)
+			table.insert(tree,leg)
 		end
 	end
 	minetest.bulk_set_node(tree, {name = "mcl_core:tree", param2 = 2})
@@ -38,8 +38,8 @@ mcl_structures.register_structure("witch_hut",{
 	place_on = {"group:sand","group:grass_block","mcl_core:water_source","group:dirt"},
 	fill_ratio = 0.01,
 	flags = "place_center_x, place_center_z, liquid_surface, force_placement",
-	sidelen = 5,
-	chunk_probability = 256,
+	sidelen = 8,
+	chunk_probability = 400,
 	y_max = mcl_vars.mg_overworld_max,
 	y_min = -4,
 	y_offset = 0,