Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity

Harden mcl_skins against missing metadata

objects
Wuzzy 2019-03-05 14:33:16 +01:00
parent 918c408e4d
commit a1c0a1f82f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mods/PLAYER/mcl_skins/init.lua
View File

@ -53,6 +53,7 @@ while true do
end end
f = io.open(mcl_skins.modpath .. "/meta/" .. metafile) f = io.open(mcl_skins.modpath .. "/meta/" .. metafile)
data = nil
if f then if f then
data = minetest.deserialize("return {" .. f:read('*all') .. "}") data = minetest.deserialize("return {" .. f:read('*all') .. "}")
f:close() f:close()
@ -199,7 +200,12 @@ minetest.register_chatcommand("setskin", {
local skinfile = "#"..skin_id local skinfile = "#"..skin_id
local meta = mcl_skins.meta[mcl_skins.skins[playername]] local meta = mcl_skins.meta[mcl_skins.skins[playername]]
local your_msg = S("Your skin has been set to: @1 (@2)", meta.name, skinfile) local your_msg
if not meta.name or meta.name == "" then
your_msg = S("Your skin has been set to: @1", skinfile)
else
your_msg = S("Your skin has been set to: @1 (@2)", meta.name, skinfile)
end
if name == playername then if name == playername then
return true, your_msg return true, your_msg
else else
@ -233,7 +239,7 @@ mcl_skins.show_formspec = function(playername)
for i = 0, mcl_skins.skin_count do for i = 0, mcl_skins.skin_count do
local label = S("@1 (@2)", mcl_skins.meta[mcl_skins.list[i] ].name, "#"..i) local label = S("@1 (@2)", mcl_skins.meta[mcl_skins.list[i]].name, "#"..i)
formspec = formspec .. minetest.formspec_escape(label) formspec = formspec .. minetest.formspec_escape(label)
@ -252,7 +258,7 @@ mcl_skins.show_formspec = function(playername)
formspec = formspec .. "image[0,0;1.35,2.7;" .. mcl_skins.previews[playername] .. ".png]" formspec = formspec .. "image[0,0;1.35,2.7;" .. mcl_skins.previews[playername] .. ".png]"
if meta then if meta then
if meta.name then if meta.name and meta.name ~= "" then
formspec = formspec .. "label[2,0.5;" .. minetest.formspec_escape(S("Name: @1", meta.name)) .. "]" formspec = formspec .. "label[2,0.5;" .. minetest.formspec_escape(S("Name: @1", meta.name)) .. "]"
end end
end end