Fix merge conflict
parent
d1f0ade2e8
commit
1f58cfb240
|
@ -281,14 +281,15 @@ function mcl_structures.place_structure(pos, def, pr, blockseed)
|
|||
end,pr)
|
||||
end
|
||||
end
|
||||
elseif def.after_place then ap = def.after_place
|
||||
elseif def.after_place then
|
||||
ap = def.after_place
|
||||
end
|
||||
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 def.loot then generate_loot(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
|
||||
return ap(pp,def,pr,blockseed,p1,p2,size,rotation)
|
||||
end,pr)
|
||||
if log_enabled then
|
||||
minetest.log("action","[mcl_structures] "..def.name.." placed at "..minetest.pos_to_string(pp))
|
||||
|
|
Loading…
Reference in New Issue