From 1f58cfb240697d2a319b037f211533eb738e75b1 Mon Sep 17 00:00:00 2001 From: cora Date: Fri, 28 Oct 2022 21:50:44 +0200 Subject: [PATCH] Fix merge conflict --- mods/MAPGEN/mcl_structures/api.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mods/MAPGEN/mcl_structures/api.lua b/mods/MAPGEN/mcl_structures/api.lua index 6a7fc2c39..c11d62203 100644 --- a/mods/MAPGEN/mcl_structures/api.lua +++ b/mods/MAPGEN/mcl_structures/api.lua @@ -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))