Merge branch master-MC1.7.10 into master-MC1.10

This commit is contained in:
payonel 2017-11-28 22:47:34 -08:00
commit 893f76c8ff

View File

@ -114,8 +114,13 @@ while tty.isAvailable() do
end end
io.stderr:write(tostring(result[2]) .. "\n") io.stderr:write(tostring(result[2]) .. "\n")
else else
for i = 2, result.n do local ok, why = pcall(function()
io.write(require("serialization").serialize(result[i], true) .. "\t") for i = 2, result.n do
io.write(require("serialization").serialize(result[i], true) .. "\t")
end
end)
if not ok then
io.stderr:write("crashed serializing result: ", tostring(why))
end end
if tty.getCursor() > 1 then if tty.getCursor() > 1 then
io.write("\n") io.write("\n")