From 7d80fbcb6099ddb4760629bef3ba8495196e860c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Thu, 3 Jul 2014 18:38:42 +0200 Subject: [PATCH] Re-throwing UnsupportedOperationExceptions as Lua errors when thrown in callbacks (usually in OpenComponents' CC wrapper stuff). --- .../oc/server/component/machine/NativeLuaArchitecture.scala | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/scala/li/cil/oc/server/component/machine/NativeLuaArchitecture.scala b/src/main/scala/li/cil/oc/server/component/machine/NativeLuaArchitecture.scala index c931e1875..3ee8456fb 100644 --- a/src/main/scala/li/cil/oc/server/component/machine/NativeLuaArchitecture.scala +++ b/src/main/scala/li/cil/oc/server/component/machine/NativeLuaArchitecture.scala @@ -94,6 +94,10 @@ class NativeLuaArchitecture(val machine: api.machine.Machine) extends Architectu lua.pushNil() lua.pushString("i/o error") 3 + case _: UnsupportedOperationException => + lua.pushBoolean(false) + lua.pushString("unsupported operation") + 2 case e: Throwable => OpenComputers.log.log(Level.WARNING, "Unexpected error in Lua callback.", e) lua.pushBoolean(true)