From eb289d57cfe924e061c92ecc57761d358a57e912 Mon Sep 17 00:00:00 2001 From: osmarks Date: Mon, 13 Aug 2018 08:56:30 +0100 Subject: [PATCH] Fix some errory stuff --- lib.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib.lua b/lib.lua index 71a079c..07e47dd 100644 --- a/lib.lua +++ b/lib.lua @@ -32,9 +32,9 @@ errors.format = function(e) return "Internal error - provided info: " .. textutils.serialise(e.data) .. "." elseif e.error == errors.INVALID then return "Request invalid." - elseif e.errors == errors.NOPATTERN then + elseif e.error == errors.NOPATTERN then return "Missing pattern " .. textutils.serialise(e.data) .. "." - elseif e.errors == errors.NOITEMS then + elseif e.error == errors.NOITEMS then local thing_missing = "???" if type(e.data) == "table" and e.data.type and e.data.quantity then thing_missing = tostring(e.data.quantity) .. " " .. e.data.type @@ -43,17 +43,17 @@ errors.format = function(e) end return "Missing " .. thing_missing .. " to fulfil request." - elseif e.errors == errors.NORESPONSE then + elseif e.error == errors.NORESPONSE then local text = "No response" if e.data then text = text .. " from " .. textutils.serialise(e.data) end return text .. "." - elseif e.errors == errors.NOMATCHINGNODE then + elseif e.error == errors.NOMATCHINGNODE then if e.data then return "No " .. textutils.serialise(e.data) .. " node found." else return "No node of desired type found." end - elseif e.errors == errors.NOSPACE then + elseif e.error == errors.NOSPACE then return "No available storage space." else return "Error is invalid. Someone broke it." @@ -259,7 +259,7 @@ local function unwrap(x, msg) local text = "An error occured" if msg then text = text .. " " .. msg else text = text .. "!" end - text = text .. ".\nDetails: " .. errors.format(x.error) + text = text .. ".\nDetails: " .. errors.format(x) error(text) elseif x.type == "response" then return x.response