From f2aa87b3966939bd20804e16ee1a7b57de739f67 Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Tue, 23 Feb 2021 01:31:24 +0000
Subject: [PATCH] terrain: pick the node to replace with from higher up in the
 column in question ....unless we hit the ignore node, in which case we
 default to air.

---
 worldeditadditions/utils/terrain.lua | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/worldeditadditions/utils/terrain.lua b/worldeditadditions/utils/terrain.lua
index 2875309..e54b254 100644
--- a/worldeditadditions/utils/terrain.lua
+++ b/worldeditadditions/utils/terrain.lua
@@ -82,6 +82,7 @@ end
 function worldeditadditions.apply_heightmap_changes(pos1, pos2, area, data, heightmap_old, heightmap_new, heightmap_size)
 	local stats = { added = 0, removed = 0 }
 	local node_id_air = minetest.get_content_id("air")
+	local node_id_ignore = minetest.get_content_id("ignore")
 	
 	for z = heightmap_size[0], 0, -1 do
 		for x = heightmap_size[1], 0, -1 do
@@ -95,12 +96,23 @@ function worldeditadditions.apply_heightmap_changes(pos1, pos2, area, data, heig
 			if height_old == height_new then
 				-- noop
 			elseif height_new < height_old then
+				local node_id_replace = data[area:index(
+					pos1.x + x,
+					pos1.y + height_old + 1,
+					pos1.z + z
+				)]
+				-- Unlikely, but if it can happen, it *will* happen.....
+				if node_id_replace == node_id_ignore then
+					node_id_replace = node_id_air
+				end
 				stats.removed = stats.removed + (height_old - height_new)
 				local y = height_new
 				while y < height_old do
 					local ci = area:index(pos1.x + x, pos1.y + y, pos1.z + z)
 					-- print("[conv/save] remove at y", y, "→", pos1.y + y, "current:", minetest.get_name_from_content_id(data[ci]))
-					data[ci] = node_id_air
+					if data[ci] ~= node_id_ignore then
+						data[ci] = node_id_replace
+					end
 					y = y + 1
 				end
 			else -- height_new > height_old
@@ -113,7 +125,9 @@ function worldeditadditions.apply_heightmap_changes(pos1, pos2, area, data, heig
 				while y < height_new do
 					local ci = area:index(pos1.x + x, pos1.y + y, pos1.z + z)
 					-- print("[conv/save] add at y", y, "→", pos1.y + y, "current:", minetest.get_name_from_content_id(data[ci]))
-					data[ci] = node_id
+					if data[ci] ~= node_id_ignore then
+						data[ci] = node_id
+					end
 					y = y + 1
 				end
 			end