summaryrefslogtreecommitdiff
path: root/worldedit/serialization.lua
diff options
context:
space:
mode:
authorest31 <MTest31@outlook.com>2015-03-12 02:21:01 +0100
committerest31 <MTest31@outlook.com>2015-03-12 02:40:19 +0100
commit09de34aabfe83b0b6eaf09d3e9653eb72f702136 (patch)
tree002c54d1e3cdaa5320cad174c12f8f46eee41035 /worldedit/serialization.lua
parentc1bd4986b040d1943a8b5f93a44db72f55dd152d (diff)
Load first node too with LuaJIT
Before, the first node would have had the version number prepended (e.g. "5:"), and therefore wouldn't be loaded.
Diffstat (limited to 'worldedit/serialization.lua')
-rw-r--r--worldedit/serialization.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/worldedit/serialization.lua b/worldedit/serialization.lua
index bec7e09..00d984d 100644
--- a/worldedit/serialization.lua
+++ b/worldedit/serialization.lua
@@ -159,20 +159,20 @@ local function load_schematic(value)
else
-- XXX: This is a filthy hack that works surprisingly well - in LuaJIT, `minetest.deserialize` will fail due to the register limit
nodes = {}
- value = value:gsub("return%s*{", "", 1):gsub("}%s*$", "", 1) -- remove the starting and ending values to leave only the node data
- local escaped = value:gsub("\\\\", "@@"):gsub("\\\"", "@@"):gsub("(\"[^\"]*\")", function(s) return string.rep("@", #s) end)
+ content = content:gsub("return%s*{", "", 1):gsub("}%s*$", "", 1) -- remove the starting and ending values to leave only the node data
+ local escaped = content:gsub("\\\\", "@@"):gsub("\\\"", "@@"):gsub("(\"[^\"]*\")", function(s) return string.rep("@", #s) end)
local startpos, startpos1, endpos = 1, 1
while true do -- go through each individual node entry (except the last)
startpos, endpos = escaped:find("},%s*{", startpos)
if not startpos then
break
end
- local current = value:sub(startpos1, startpos)
+ local current = content:sub(startpos1, startpos)
local entry = minetest.deserialize("return " .. current)
table.insert(nodes, entry)
startpos, startpos1 = endpos, endpos
end
- local entry = minetest.deserialize("return " .. value:sub(startpos1)) -- process the last entry
+ local entry = minetest.deserialize("return " .. content:sub(startpos1)) -- process the last entry
table.insert(nodes, entry)
end
else