nalc/moretrees
1
0
Fork 0
forked from mtcontrib/moretrees
Code Issues Pull Requests Releases Wiki Activity

Fix max search area exceeded crash.

Browse Source 
find_nodes_in_area is limited to 82^3 nodes, and will abort
the server if that is exceeded. Assure we never do.
This commit is contained in:
Auke Kok 2017-12-15 12:32:53 -08:00
parent aac8386b5a
commit 1c0e3c7215
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
date_palm.lua
View File

@ -223,13 +223,18 @@ local function find_fruit_trunks_near(ftpos, sect)
return nil return nil
end end
local basevec = { x = ftpos.x + 2 * sect.x * sect_hr,
y = ftpos.y,
z = ftpos.z + 2 * sect.z * sect_hr}
-- find_nodes_in_area is limited to 82^3, make sure to not overrun it
local sizevec = { x = sect_hr, y = sect_vr, z = sect_hr }
if sect_hr * sect_hr * sect_vr > 41^3 then
sizevec = vector.apply(sizevec, function(a) return math.min(a, 41) end)
end
local all_palms = minetest.find_nodes_in_area( local all_palms = minetest.find_nodes_in_area(
{ x = ftpos.x + 2 * sect.x * sect_hr - sect_hr, vector.subtract(basevec, sizevec),
y = ftpos.y - sect_vr, vector.add(basevec, sizevec),
z = ftpos.z + 2 * sect.z * sect_hr - sect_hr },
{ x = ftpos.x + 2 * sect.x * sect_hr + sect_hr,
y = ftpos.y + sect_vr,
z = ftpos.z + 2 * sect.z * sect_hr + sect_hr },
{"moretrees:date_palm_mfruit_trunk", "moretrees:date_palm_ffruit_trunk"}) {"moretrees:date_palm_mfruit_trunk", "moretrees:date_palm_ffruit_trunk"})
-- Collect different palms in separate lists. -- Collect different palms in separate lists.