From e30719a3bb02634ab9fe8f52b1b7994fa521ad67 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Fri, 18 Aug 2017 13:28:20 +0200
Subject: [PATCH] Fix some mapgen bugs WRT The End

---
 mods/MAPGEN/mcl_biomes/init.lua      |  4 ++--
 mods/MAPGEN/mcl_mapgen_core/init.lua | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua
index 291d759a7b..dc2b63f344 100644
--- a/mods/MAPGEN/mcl_biomes/init.lua
+++ b/mods/MAPGEN/mcl_biomes/init.lua
@@ -571,8 +571,8 @@ local function register_dimension_biomes()
 	minetest.register_biome({
 		name = "end",
 		node_stone = "air",
-		node_filler = "mcl_end:end_stone",
-		node_water = "mcl_end:end_stone",
+		node_filler = "air",
+		node_water = "air",
 		node_river_water = "air",
 		-- FIXME: For some reason the End stops generating early if this constant is not added.
 		-- Figure out why.
diff --git a/mods/MAPGEN/mcl_mapgen_core/init.lua b/mods/MAPGEN/mcl_mapgen_core/init.lua
index 68687d9710..a9ef2f97fe 100644
--- a/mods/MAPGEN/mcl_mapgen_core/init.lua
+++ b/mods/MAPGEN/mcl_mapgen_core/init.lua
@@ -1222,7 +1222,6 @@ minetest.register_on_generated(function(minp, maxp)
 		local c_soul_sand = minetest.get_content_id("mcl_nether:soul_sand")
 		local c_netherrack = minetest.get_content_id("mcl_nether:netherrack")
 		local c_nether_lava = minetest.get_content_id("mcl_nether:nether_lava_source")
-		local c_end_stone = minetest.get_content_id("mcl_end:end_stone")
 		local c_realm_barrier = minetest.get_content_id("mcl_core:realm_barrier")
 		local c_air = minetest.get_content_id("air")
 
@@ -1281,7 +1280,7 @@ minetest.register_on_generated(function(minp, maxp)
 						data[p_pos] = setdata
 						lvm_used = true
 					elseif mcl_util.is_in_void({x=x,y=y,z=z}) then
-						setdata = c_void
+						data[p_pos] = c_void
 						lvm_used = true
 					-- Big lava seas by replacing air below a certain height
 					elseif mcl_vars.mg_lava and data[p_pos] == c_air then
@@ -1300,11 +1299,7 @@ minetest.register_on_generated(function(minp, maxp)
 					elseif y >= mcl_vars.mg_realm_barrier_overworld_end_min and y <= mcl_vars.mg_realm_barrier_overworld_end_max then
 						data[p_pos] = c_realm_barrier
 						lvm_used = true
-					-- Clear the End
-					elseif y <= mcl_vars.mg_end_max and y >= mcl_vars.mg_end_min then
-						--data[p_pos] = c_air
-						--lvm_used = true
-					-- Nether support for v6 because v6 does not support the biomes API
+					-- Nether and End support for v6 because v6 does not support the biomes API
 					elseif mg_name == "v6" then
 						if y <= mcl_vars.mg_nether_max and y >= mcl_vars.mg_nether_min then
 							if data[p_pos] == c_stone then
@@ -1314,6 +1309,11 @@ minetest.register_on_generated(function(minp, maxp)
 								data[p_pos] = c_soul_sand
 								lvm_used = true
 							end
+						elseif y <= mcl_vars.mg_end_max and y >= mcl_vars.mg_end_min then
+							if data[p_pos] == c_stone or data[p_pos] == c_dirt or data[p_pos] == c_sand then
+								data[p_pos] = c_air
+								lvm_used = true
+							end
 						end
 					end
 				end