vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix the return of LuaResult from hook call

Browse Source
This commit is contained in:
Oiltanker
2022-04-18 14:01:40 +03:00
parent d7368475fe
commit 8bcd19a4ff
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs
+9 -3
View File
@@ -435,7 +435,14 @@ namespace Barotrauma
} }
else if (result is T cRes && cRes != null) lastResult = cRes; else if (result is T cRes && cRes != null) lastResult = cRes;
} }
else if (result is T res && res != null) lastResult = res; else
{
if (result is LuaResult lRes)
{
if (!lRes.IsNull()) lastResult = (T)(object)lRes.DynValue();
}
else lastResult = (T)result;
}
} }
} }
catch (Exception e) catch (Exception e)
@@ -443,8 +450,7 @@ namespace Barotrauma
StringBuilder argsSb = new StringBuilder(); StringBuilder argsSb = new StringBuilder();
foreach (var arg in args) argsSb.Append(arg + " "); foreach (var arg in args) argsSb.Append(arg + " ");
GameMain.LuaCs.HandleException( GameMain.LuaCs.HandleException(
e, $"Error in Hook '{name}'->'{key}', with args '{argsSb}':\n{e}", e, $"Error in Hook '{name}'->'{key}', with args '{argsSb}':\n{e}", ExceptionType.Both);
LuaCsSetup.ExceptionType.Both);
} }
} }
} }