mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-12-23 16:39:33 +01:00
Merge pull request 'Fix possible crash in v6 and singlenode mapgens' (#2826) from fix_v6_singlenode_crash into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2826
This commit is contained in:
commit
d00f5a695f
1 changed files with 2 additions and 1 deletions
|
@ -251,6 +251,7 @@ end
|
|||
|
||||
local function set_palette(minp,maxp,data2,area,biomemap,nodes)
|
||||
-- Flat area at y=0 to read biome 3 times faster than 5.3.0.get_biome_data(pos).biome: 43us vs 125us per iteration:
|
||||
if not biomemap then return end
|
||||
local aream = VoxelArea:new({MinEdge={x=minp.x, y=0, z=minp.z}, MaxEdge={x=maxp.x, y=0, z=maxp.z}})
|
||||
local nodes = minetest.find_nodes_in_area(minp, maxp, nodes)
|
||||
for n=1, #nodes do
|
||||
|
@ -353,7 +354,7 @@ mcl_mapgen_core.register_generator("end_fixes", end_basic, function(minp,maxp)
|
|||
if maxp.y < mcl_vars.mg_end_min or minp.y > mcl_vars.mg_end_max then return end
|
||||
end, 9999, true)
|
||||
|
||||
if mg_name ~= "v6" then
|
||||
if mg_name ~= "v6" and mg_name ~= "singlenode" then
|
||||
mcl_mapgen_core.register_generator("block_fixes", block_fixes, nil, 9999, true)
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue