osmarks/wyvern
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the wyvern item conversion

Browse Source
This commit is contained in:
osmarks 2018-08-13 08:28:44 +01:00
parent 49391a733b
commit c32e15e097
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend-chests.lua
View File

@ -36,8 +36,8 @@ local function cache(item, chest, slot)
end end
end end
local function to_wyvern_item(plethora_item) local function to_wyvern_item(item)
return { NBT = plethora_item.nbtHash, ID = plethora_item.name, meta = plethora_item.damage, display_name = plethora_item.displayName, count = plethora_item.count } return { NBT_hash = item.NBT_hash or item.nbtHash, ID = item.ID or item.name, meta = item.meta or item.damage, display_name = item.display_name or item.displayName, count = item.count }
end end
local index = {} local index = {}
@ -90,12 +90,12 @@ local function find_space()
end end
end end
local function find_by_ID_meta_NBT(ID, meta, NBT) local function find_by_ID_meta_NBT(ID, meta, NBT_hash)
return find(function(item) return find(function(item)
return return
(not meta or item.meta == meta) and -- if metadata provided, ensure match (not meta or item.meta == meta) and -- if metadata provided, ensure match
(not ID or item.ID == ID) and -- if internal name provided, ensure match (not ID or item.ID == ID) and -- if internal name provided, ensure match
(not NBT or item.NBT == NBT) -- if NBT hash provided, ensure match (not NBT_hash or item.NBT_hash == NBT_hash) -- if NBT hash provided, ensure match
end) end)
end end
@ -133,7 +133,7 @@ local function server(command)
elseif command.type == "reindex" then elseif command.type == "reindex" then
os.queueEvent "reindex" os.queueEvent "reindex"
elseif command.type == "extract" then elseif command.type == "extract" then
local result = find_by_ID_meta_NBT(command.ID, command.meta, command.NBT) local result = find_by_ID_meta_NBT(command.ID, command.meta, command.NBT_hash)
local first_available = result[1] local first_available = result[1]
-- Check if we have an item, and its stack is big enough; otherwise, send back an error. -- Check if we have an item, and its stack is big enough; otherwise, send back an error.