Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-11-25 20:11:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash in villagegen

Browse source
This commit is contained in:
cora 2022-10-28 13:34:58 +02:00
parent 5d26595f4a
commit 6b8236e8f3
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mods/CORE/mcl_util/init.lua
View file

@ -23,6 +23,7 @@ function table.update_nil(t, ...)
end end
function mcl_util.file_exists(name) function mcl_util.file_exists(name)
if type(name) ~= "string" then return end
local f = io.open(name) local f = io.open(name)
if not f then if not f then
return false return false

4
mods/MAPGEN/mcl_structures/api.lua
View file

@ -32,8 +32,8 @@ local function ecb_place(blockpos, action, calls_remaining, param)
end end
function mcl_structures.place_schematic(pos, schematic, rotation, replacements, force_placement, flags, after_placement_callback, pr, callback_param) function mcl_structures.place_schematic(pos, schematic, rotation, replacements, force_placement, flags, after_placement_callback, pr, callback_param)
if not mcl_util.file_exists(schematic) then if type(schematic) ~= "table" and not mcl_util.file_exists(schematic) then
minetest.log("warning","[mcl_structures] schematic file "..schematic.." does not exist.") minetest.log("warning","[mcl_structures] schematic file "..tostring(schematic).." does not exist.")
return end return end
local s = loadstring(minetest.serialize_schematic(schematic, "lua", {lua_use_comments = false, lua_num_indent_spaces = 0}) .. " return schematic")() local s = loadstring(minetest.serialize_schematic(schematic, "lua", {lua_use_comments = false, lua_num_indent_spaces = 0}) .. " return schematic")()
if s and s.size then if s and s.size then