0.4.16 compatibility

minetest-mods · Dec 31, 2018 · 108153f · 108153f
1 parent f651f7e
commit 108153f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/noise_manager.lua b/noise_manager.lua
@@ -47,8 +47,11 @@ mapgen_helper.perlin3d = function(name, minp, maxp, perlin_params)
 
 	buffer.nvals_perlin_buffer = buffer.nvals_perlin_buffer or {}
 	buffer.nobj_perlin = buffer.nobj_perlin or minetest.get_perlin_map(perlin_params, chunk_lengths)
-	local nvals_perlin = buffer.nobj_perlin:get_3d_map_flat(minp, buffer.nvals_perlin_buffer) 
-	return nvals_perlin, VoxelArea:new{MinEdge=minp, MaxEdge=maxp}
+	if buffer.nobj_perlin.get_3d_map_flat then
+		return buffer.nobj_perlin:get_3d_map_flat(minp, buffer.nvals_perlin_buffer), VoxelArea:new{MinEdge=minp, MaxEdge=maxp}
+	else
+		return buffer.nobj_perlin:get3dMap_flat(minp, buffer.nvals_perlin_buffer), VoxelArea:new{MinEdge=minp, MaxEdge=maxp}
+	end	
 end
 
 mapgen_helper.perlin2d = function(name, minp, maxp, perlin_params)
@@ -59,11 +62,13 @@ mapgen_helper.perlin2d = function(name, minp, maxp, perlin_params)
 
 	local buffer, perlin_params = get_buffer(name, sidelen, perlin_params)
 
-	perlin_buffers[name].nvals_perlin_buffer = perlin_buffers[name].nvals_perlin_buffer or {}
-	perlin_buffers[name].nobj_perlin = perlin_buffers[name].nobj_perlin or minetest.get_perlin_map(perlin_params, chunk_lengths)
-	local nvals_perlin = perlin_buffers[name].nobj_perlin:get_2d_map_flat({x=minp.x, y=minp.z}, perlin_buffers[name].nvals_perlin_buffer)
-
-	return nvals_perlin
+	buffer.nvals_perlin_buffer = perlin_buffers[name].nvals_perlin_buffer or {}
+	buffer.nobj_perlin = perlin_buffers[name].nobj_perlin or minetest.get_perlin_map(perlin_params, chunk_lengths)
+	if buffer.nobj_perlin.get_2d_map_flat then
+		return buffer.nobj_perlin:get_2d_map_flat({x=minp.x, y=minp.z}, perlin_buffers[name].nvals_perlin_buffer)
+	else
+		return buffer.nobj_perlin:get2dMap_flat({x=minp.x, y=minp.z}, perlin_buffers[name].nvals_perlin_buffer)
+	end	
 end
 
 mapgen_helper.index2d = function(minp, maxp, x, z) 

diff --git a/place_schematic.lua b/place_schematic.lua
@@ -256,9 +256,14 @@ mapgen_helper.place_schematic_on_data = function(data, data_param2, area, pos, s
 									or (not place_on_condition and (old_node_id == c_air or old_node_id == c_ignore)))
 									and (placement_prob == 255 or math.random(1,255) <= placement_prob)
 								then
-									local paramtype2 = minetest.registered_nodes[node_name].paramtype2
-									data[vi] = minetest.get_content_id(node_name)
-									data_param2[vi] = rotate_param2(node_def.param2, paramtype2, rotation)			
+									local registered_def = minetest.registered_nodes[node_name]
+									if registered_def ~= nil then
+										local paramtype2 = registered_def.paramtype2
+										data[vi] = minetest.get_content_id(node_name)
+										data_param2[vi] = rotate_param2(node_def.param2, paramtype2, rotation)
+									else
+										minetest.log("error", "mapgen_helper.place_schematic was given a schematic with unregistered node " .. tostring(node_name) .. " in it.")
+									end
 								end
 							end
 						end