From 43f172a190cdb205572527b8fa736b8e1a5a7e7a Mon Sep 17 00:00:00 2001 From: Jacobin Date: Wed, 4 May 2022 11:27:46 +1000 Subject: [PATCH] Remove exception handling on Require This was just eating exceptions; exceptions should instead propagate to a more appropriate handler (`pcall` should now work). --- .../SharedSource/LuaCs/LuaCsSetup.cs | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs index 5ebfe331b..d44f519f4 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs @@ -318,18 +318,7 @@ namespace Barotrauma return null; } - public DynValue Require(string moduleName, Table globalContexts) - { - try - { - return require.Require(moduleName, globalContexts); - } - catch (Exception e) - { - HandleException(e); - } - return null; - } + public object CallLuaFunction(object function, params object[] arguments) { try @@ -444,7 +433,7 @@ namespace Barotrauma lua.Globals["dofile"] = (Func)DoFile; lua.Globals["loadfile"] = (Func)LoadFile; - lua.Globals["require"] = (Func)Require; + lua.Globals["require"] = (Func)require.Require; lua.Globals["dostring"] = (Func)DoString; lua.Globals["load"] = (Func)LoadString;