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

fix patch hooks not working correctly with void return types

Browse Source
This commit is contained in:
Evil Factory
2022-04-29 12:10:20 -03:00
parent 96bdb143ee
commit 72b2492f0d
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs
View File

@@ -125,7 +125,9 @@ namespace Barotrauma
foreach (var tuple in methodSet)
{
if (tuple.Item3 != null && tuple.Item3.IsDisposed)
{
outOfSocpe.Add(tuple);
}
else
{
var _result = tuple.Item2(__instance, args);
@@ -135,15 +137,24 @@ namespace Barotrauma
{
if (!res.IsNull())
{
if (__originalMethod is MethodInfo mi) result = res.DynValue().ToObject(mi.ReturnType);
else result = res.DynValue().ToObject();
if (__originalMethod is MethodInfo mi && mi.ReturnType != typeof(void))
{
result = res.DynValue().ToObject(mi.ReturnType);
}
else
{
result = res.DynValue().ToObject();
}
}
}
else result = _result;
else
{
result = _result;
}
}
}
}
foreach (var tuple in outOfSocpe) methodSet.Remove(tuple);
foreach (var tuple in outOfSocpe) { methodSet.Remove(tuple); }
}
}
catch (Exception ex)