3raven
/
MineClone2-french-translation
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Fix merge conflict

This commit is contained in:
cora 2022-10-28 21:50:44 +02:00
parent d1f0ade2e8
commit 1f58cfb240
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mods/MAPGEN/mcl_structures/api.lua
View File

@ -281,14 +281,15 @@ function mcl_structures.place_structure(pos, def, pr, blockseed)
end,pr) end,pr)
end end
end end
elseif def.after_place then ap = def.after_place elseif def.after_place then
ap = def.after_place
end end
mcl_structures.place_schematic(pp, file, rot, def.replacements, true, "place_center_x,place_center_z",function(p1, p2, size, rotation) mcl_structures.place_schematic(pp, file, rot, def.replacements, true, "place_center_x,place_center_z",function(p1, p2, size, rotation)
if not def.daughters then if not def.daughters then
if def.loot then generate_loot(pp,def,pr,blockseed) end if def.loot then generate_loot(pp,def,pr,blockseed) end
if def.construct_nodes then construct_nodes(pp,def,pr,blockseed) end if def.construct_nodes then construct_nodes(pp,def,pr,blockseed) end
return ap(pp,def,pr,blockseed,p1,p2,size,rotation)
end end
return ap(pp,def,pr,blockseed,p1,p2,size,rotation)
end,pr) end,pr)
if log_enabled then if log_enabled then
minetest.log("action","[mcl_structures] "..def.name.." placed at "..minetest.pos_to_string(pp)) minetest.log("action","[mcl_structures] "..def.name.." placed at "..minetest.pos_to_string(pp))