From 00fea37f3f733b7a4d12424e9eaac979c152d8ec Mon Sep 17 00:00:00 2001 From: "kepler155c@gmail.com" Date: Thu, 6 Dec 2018 23:13:43 -0500 Subject: [PATCH] manipulators! --- sys/extensions/1.device.lua | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/sys/extensions/1.device.lua b/sys/extensions/1.device.lua index 4eabc34..003ae14 100644 --- a/sys/extensions/1.device.lua +++ b/sys/extensions/1.device.lua @@ -155,18 +155,23 @@ end drivers['manipulator'] = function(dev) if dev.getName then - local name = dev.getName() - if dev.getInventory then - createDevice(name .. ':inventory', 'inventory', 'getInventory', dev) - end - if dev.getEquipment then - createDevice(name .. ':equipment', 'equipment', 'getEquipment', dev) - end - if dev.getEnder then - createDevice(name .. ':enderChest', 'enderChest', 'getEnder', dev) - end + local name + pcall(function() + name = dev.getName() + end) + if name then + if dev.getInventory then + createDevice(name .. ':inventory', 'inventory', 'getInventory', dev) + end + if dev.getEquipment then + createDevice(name .. ':equipment', 'equipment', 'getEquipment', dev) + end + if dev.getEnder then + createDevice(name .. ':enderChest', 'enderChest', 'getEnder', dev) + end - return dev._children + return dev._children + end end end