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

Merge branch 'pg-grow-fern-saplings' into 'master'

Browse Source 
Fix growth of tree fern saplings

See merge request VanessaE/plantlife_modpack!3
This commit is contained in:
Vanessa Dannenberg
2019-04-11 22:44:09 +00:00
parent 4e32feaa55 229d6aba88
commit 0d228f705c
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ferns/gianttreefern.lua
View File

@@ -14,10 +14,10 @@ local S = plantlife_i18n.gettext
-- lot of code, lot to load -- lot of code, lot to load
abstract_ferns.grow_giant_tree_fern = function(pos) abstract_ferns.grow_giant_tree_fern = function(pos)
local pos_01 = {x = pos.x, y = pos.y + 1, z = pos.z} local pos_aux = {x = pos.x, y = pos.y + 1, z = pos.z}
if minetest.get_node(pos_01).name ~= "air" local name = minetest.get_node(pos_aux).name
and minetest.get_node(pos_01).name ~= "ferns:sapling_giant_tree_fern" if name ~= "air" and name ~= "ferns:sapling_giant_tree_fern"
and minetest.get_node(pos_01).name ~= "default:junglegrass" then and name ~= "default:junglegrass" then
return return
end end
@@ -64,7 +64,9 @@ abstract_ferns.grow_giant_tree_fern = function(pos)
local brk = false local brk = false
for i = 1, size-3 do for i = 1, size-3 do
if minetest.get_node({x = pos.x, y = pos.y + i, z = pos.z}).name ~= "air" then pos_aux.y = pos.y + i
local name = minetest.get_node(pos_aux).name
if not (name == "air" or (i == 1 and name == "ferns:sapling_giant_tree_fern")) then
brk = true brk = true
break break
end end

12
ferns/treefern.lua
View File

@@ -13,10 +13,10 @@ assert(abstract_ferns.config.enable_treefern == true)
abstract_ferns.grow_tree_fern = function(pos) abstract_ferns.grow_tree_fern = function(pos)
local pos_01 = {x = pos.x, y = pos.y + 1, z = pos.z} local pos_aux = {x = pos.x, y = pos.y + 1, z = pos.z}
if minetest.get_node(pos_01).name ~= "air" local name = minetest.get_node(pos_aux).name
and minetest.get_node(pos_01).name ~= "ferns:sapling_tree_fern" if name ~= "air" and name ~= "ferns:sapling_tree_fern"
and minetest.get_node(pos_01).name ~= "default:junglegrass" then and name ~= "default:junglegrass" then
return return
end end
@@ -30,7 +30,9 @@ abstract_ferns.grow_tree_fern = function(pos)
local i = 1 local i = 1
local brk = false local brk = false
while (i < size) do while (i < size) do
if minetest.get_node({x = pos.x, y = pos.y + i, z = pos.z}).name ~= "air" then pos_aux.y = pos.y + i
name = minetest.get_node(pos_aux).name
if not (name == "air" or (i == 1 and name == "ferns:sapling_tree_fern")) then
brk = true brk = true
break break
end end