mff
/
minetest-mod-snow
forked from mtcontrib/minetest-mod-snow
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

abort mapgen if no nodes are set and execute collectgarbage to clean memory

This commit is contained in:
HybridDog 2016-02-13 19:11:01 +01:00
parent a6af64f3f1
commit b994bbc5fd
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mapgen_v6.lua
View File

@ -208,6 +208,8 @@ minetest.register_on_generated(function(minp, maxp, seed)
-- Reseed random -- Reseed random
pr = PseudoRandom(seed+68) pr = PseudoRandom(seed+68)
local nodes_added
-- Loop through columns in chunk -- Loop through columns in chunk
local smooth = smooth and not snowy local smooth = smooth and not snowy
local write_to_map = false local write_to_map = false
@ -251,6 +253,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
local vi = area:index(x, ground_y, z) local vi = area:index(x, ground_y, z)
if data[vi] == c.leaves if data[vi] == c.leaves
or data[vi] == c.jungleleaves then or data[vi] == c.jungleleaves then
nodes_added = true
for y = ground_y, -16, -1 do for y = ground_y, -16, -1 do
local vi = area:index(x, y, z) local vi = area:index(x, y, z)
local id = data[vi] local id = data[vi]
@ -269,6 +272,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
end end
end end
else else
nodes_added = true
write_to_map = true write_to_map = true
if not nvals_ice then if not nvals_ice then
nvals_ice = minetest.get_perlin_map(np_ice, chulens):get2dMap_flat({x=x0, y=z0}) nvals_ice = minetest.get_perlin_map(np_ice, chulens):get2dMap_flat({x=x0, y=z0})
@ -457,6 +461,14 @@ minetest.register_on_generated(function(minp, maxp, seed)
end end
end end
-- abort if mapgen doesn't change sth
if not nodes_added then
return
end
-- try to fix oom memory crashes
minetest.after(0, collectgarbage)
if num ~= 1 then if num ~= 1 then
for _,i in pairs(snow_tab) do for _,i in pairs(snow_tab) do
-- set snow -- set snow