From 2743792ef3e7731aea47c31684c20de75e2af6ef Mon Sep 17 00:00:00 2001 From: kepler155c Date: Wed, 14 Mar 2018 08:45:43 -0400 Subject: [PATCH] 1.7.10 compatibility --- apis/meAdapter.lua | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/apis/meAdapter.lua b/apis/meAdapter.lua index 94091a6..87f0f00 100644 --- a/apis/meAdapter.lua +++ b/apis/meAdapter.lua @@ -69,22 +69,34 @@ function MEAdapter:init(args) end function MEAdapter:isValid() - return self.getAvailableItems and self.getAvailableItems() + pcall(function() + return self.getAvailableItems and self.getAvailableItems() + end) end function MEAdapter:refresh() - self.items = self.getAvailableItems('all') - for _,v in pairs(self.items) do - Util.merge(v, v.item) - convertItem(v) + self.items = nil - if not itemDB:get(v) then - itemDB:add(v, v) + local s, m = pcall(function() + self.items = self.getAvailableItems('all') + for _,v in pairs(self.items) do + Util.merge(v, v.item) + convertItem(v) + + if not itemDB:get(v) then + itemDB:add(v, v) + end end - end + end) itemDB:flush() - return self.items + if not s and m then + debug(m) + end + + if s and not Util.empty(self.items) then + return self.items + end end function MEAdapter:listItems()