mirror of
https://github.com/mt-mods/plantlife_modpack.git
synced 2024-12-25 01:50:20 +01:00
fix incorrect filtering-out of group: in surface registration.
This commit is contained in:
parent
1f6695189b
commit
f270890a5d
@ -145,7 +145,7 @@ function plantslib:register_generate_plant(biomedef, nodes_or_function_or_model)
|
|||||||
plantslib.actionslist_no_aircheck[#plantslib.actionslist_no_aircheck + 1] = { biomedef, nodes_or_function_or_model }
|
plantslib.actionslist_no_aircheck[#plantslib.actionslist_no_aircheck + 1] = { biomedef, nodes_or_function_or_model }
|
||||||
local s = biomedef.surface
|
local s = biomedef.surface
|
||||||
if type(s) == "string" then
|
if type(s) == "string" then
|
||||||
if s and minetest.registered_nodes[s] then
|
if s and (string.find(s, "^group:") or minetest.registered_nodes[s]) then
|
||||||
if not search_table(plantslib.surfaceslist_no_aircheck, s) then
|
if not search_table(plantslib.surfaceslist_no_aircheck, s) then
|
||||||
plantslib.surfaceslist_no_aircheck[#plantslib.surfaceslist_no_aircheck + 1] = s
|
plantslib.surfaceslist_no_aircheck[#plantslib.surfaceslist_no_aircheck + 1] = s
|
||||||
end
|
end
|
||||||
@ -155,7 +155,7 @@ function plantslib:register_generate_plant(biomedef, nodes_or_function_or_model)
|
|||||||
else
|
else
|
||||||
for i = 1, #biomedef.surface do
|
for i = 1, #biomedef.surface do
|
||||||
local s = biomedef.surface[i]
|
local s = biomedef.surface[i]
|
||||||
if s and minetest.registered_nodes[s] then
|
if s and (string.find(s, "^group:") or minetest.registered_nodes[s]) then
|
||||||
if not search_table(plantslib.surfaceslist_no_aircheck, s) then
|
if not search_table(plantslib.surfaceslist_no_aircheck, s) then
|
||||||
plantslib.surfaceslist_no_aircheck[#plantslib.surfaceslist_no_aircheck + 1] = s
|
plantslib.surfaceslist_no_aircheck[#plantslib.surfaceslist_no_aircheck + 1] = s
|
||||||
end
|
end
|
||||||
@ -169,7 +169,7 @@ function plantslib:register_generate_plant(biomedef, nodes_or_function_or_model)
|
|||||||
plantslib.actionslist_aircheck[#plantslib.actionslist_aircheck + 1] = { biomedef, nodes_or_function_or_model }
|
plantslib.actionslist_aircheck[#plantslib.actionslist_aircheck + 1] = { biomedef, nodes_or_function_or_model }
|
||||||
local s = biomedef.surface
|
local s = biomedef.surface
|
||||||
if type(s) == "string" then
|
if type(s) == "string" then
|
||||||
if s and minetest.registered_nodes[s] then
|
if s and (string.find(s, "^group:") or minetest.registered_nodes[s]) then
|
||||||
if not search_table(plantslib.surfaceslist_aircheck, s) then
|
if not search_table(plantslib.surfaceslist_aircheck, s) then
|
||||||
plantslib.surfaceslist_aircheck[#plantslib.surfaceslist_aircheck + 1] = s
|
plantslib.surfaceslist_aircheck[#plantslib.surfaceslist_aircheck + 1] = s
|
||||||
end
|
end
|
||||||
@ -179,7 +179,7 @@ function plantslib:register_generate_plant(biomedef, nodes_or_function_or_model)
|
|||||||
else
|
else
|
||||||
for i = 1, #biomedef.surface do
|
for i = 1, #biomedef.surface do
|
||||||
local s = biomedef.surface[i]
|
local s = biomedef.surface[i]
|
||||||
if s and minetest.registered_nodes[s] then
|
if s and (string.find(s, "^group:") or minetest.registered_nodes[s]) then
|
||||||
if not search_table(plantslib.surfaceslist_aircheck, s) then
|
if not search_table(plantslib.surfaceslist_aircheck, s) then
|
||||||
plantslib.surfaceslist_aircheck[#plantslib.surfaceslist_aircheck + 1] = s
|
plantslib.surfaceslist_aircheck[#plantslib.surfaceslist_aircheck + 1] = s
|
||||||
end
|
end
|
||||||
@ -263,7 +263,7 @@ function plantslib:populate_surfaces(biome, nodes_or_function_or_model, snodes,
|
|||||||
end
|
end
|
||||||
|
|
||||||
local objtype = type(nodes_or_function_or_model)
|
local objtype = type(nodes_or_function_or_model)
|
||||||
|
print(dump(nodes_or_function_or_model))
|
||||||
if objtype == "table" then
|
if objtype == "table" then
|
||||||
if nodes_or_function_or_model.axiom then
|
if nodes_or_function_or_model.axiom then
|
||||||
plantslib:generate_tree(pos, nodes_or_function_or_model)
|
plantslib:generate_tree(pos, nodes_or_function_or_model)
|
||||||
@ -367,6 +367,7 @@ function plantslib:generate_block_no_aircheck(dtime)
|
|||||||
|
|
||||||
-- directly read the block to be searched into the chunk cache
|
-- directly read the block to be searched into the chunk cache
|
||||||
|
|
||||||
|
print(dump(plantslib.surfaceslist_no_aircheck))
|
||||||
plantslib.surface_nodes_no_aircheck.blockhash =
|
plantslib.surface_nodes_no_aircheck.blockhash =
|
||||||
minetest.find_nodes_in_area(minp, maxp, plantslib.surfaceslist_no_aircheck)
|
minetest.find_nodes_in_area(minp, maxp, plantslib.surfaceslist_no_aircheck)
|
||||||
plantslib.actioncount_no_aircheck.blockhash = 1
|
plantslib.actioncount_no_aircheck.blockhash = 1
|
||||||
|
Loading…
Reference in New Issue
Block a user