From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Sun, 21 Feb 2021 15:29:06 +0000 (+0100)
Subject: Fix various plot generation crashes
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=c447183e0540cfca7684b2d667f04898239183ca;p=elidragon_v2.git

Fix various plot generation crashes
---

diff --git a/mods/elidragon_creative/init.lua b/mods/elidragon_creative/init.lua
index 558ffb3..c62c298 100644
--- a/mods/elidragon_creative/init.lua
+++ b/mods/elidragon_creative/init.lua
@@ -2,12 +2,11 @@ local plot = elidragon.plot
 
 plot.config = {
 	gap = 32,
-	road_with = 8,
+	road_width = 8,
 	mapgen = {
-		enable = true,
 		min_y = 9,
 		max_y = 9,
-		c_border = minetest.get_content_id("mcl_core:stonebrickcarved"),
+		c_border = minetest.get_content_id("mcl_stairs:slab_stonebrick"),
 	},
 	claiming = {
 		enable_autoclaim_command = true,
diff --git a/mods/elidragon_plot/init.lua b/mods/elidragon_plot/init.lua
index 8ae305c..2cb33e3 100644
--- a/mods/elidragon_plot/init.lua
+++ b/mods/elidragon_plot/init.lua
@@ -1,9 +1,11 @@
 local plot = {}
 
 minetest.register_on_generated(function(minp, maxp)
-	local mgconfig = plot.config.mapgen
-
-	if not mgconfig.enable then
+	local config = assert(plot.config)
+	
+	local mgconfig = config.mapgen
+	
+	if not mgconfig then
 		return
 	end
 
@@ -37,13 +39,13 @@ minetest.register_on_generated(function(minp, maxp)
 		do_multiples(low + r, high + r, base, -r, func)
 	end
 
-	do_borders(minp.x, maxp.x, mgconfig.gap, mgconfig.road_width, function(x)
-		for idx in area:iter(x, math.max(minp.y, min_y), minp.z, x, math.min(maxp.y, max_y), mapx.z) do
+	do_borders(minp.x, maxp.x, config.gap, config.road_width, function(x)
+		for idx in area:iter(x, math.max(minp.y, min_y), minp.z, x, math.min(maxp.y, max_y), maxp.z) do
 			data[idx] = mgconfig.c_border
 		end
 	end)
 
-	do_borders(minp.z, maxp.z, mgconfig.gap, mgconfig.road_width, function(z)
+	do_borders(minp.z, maxp.z, config.gap, config.road_width, function(z)
 		for idx in area:iter(minp.x, math.max(minp.y, min_y), z, maxp.x, math.min(maxp.y, max_y), z) do
 			data[idx] = mgconfig.c_border
 		end
diff --git a/mods/elidragon_skyblock/init.lua b/mods/elidragon_skyblock/init.lua
index c58938f..4940ad3 100644
--- a/mods/elidragon_skyblock/init.lua
+++ b/mods/elidragon_skyblock/init.lua
@@ -6,7 +6,6 @@ plot.config = {
 	--[[min_y = 2000,
 	max_y = 31000,]]--
 	mapgen = {
-		enable = true,
 		min_y = 1000,
 		max_y = 31000,
 		void_layer = {