Fix item regex

This commit is contained in:
osmarks 2019-01-23 21:01:18 +00:00
parent a01b80c45b
commit a11cb7895d

View File

@ -180,8 +180,8 @@ end
-- Inverse of get_internal_identifier - parses that kind of string into ID/meta/NBT -- Inverse of get_internal_identifier - parses that kind of string into ID/meta/NBT
local function string_to_item(s) local function string_to_item(s)
local mod, item, meta, NBT = string.match(s, "(%a+):(%a+):([0-9]+)#([0-9a-f]+)") local mod, item, meta, NBT = string.match(s, "([A-Za-z0-9_]+):([A-Za-z0-9_]):([0-9]+)#([0-9a-f]+)")
if not NBT then mod, item, meta = string.match(s, "(%a+):(%a+):([0-9]+)") end if not NBT then mod, item, meta = string.match(s, "([A-Za-z0-9_]):([A-Za-z0-9_]):([0-9]+)") end
if not mod or not item or not meta then error(errors.make(errors.INTERNAL, "string did not match regex")) end if not mod or not item or not meta then error(errors.make(errors.INTERNAL, "string did not match regex")) end
return { ID = mod .. ":" .. item, meta = tonumber(meta), NBT = NBT } return { ID = mod .. ":" .. item, meta = tonumber(meta), NBT = NBT }
end end