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

update harmony to fix problem with __args not working correctly with static methods

Browse Source
This commit is contained in:
Evil Factory
2022-01-23 13:07:59 -03:00
parent 0a47c85a72
commit fe57d1eb87
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Barotrauma/BarotraumaClient/LinuxClient.csproj
View File

@@ -120,7 +120,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoMod.Common" Version="21.12.12.3" />
<PackageReference Include="MonoMod.Common" Version="22.1.20.1" />
<PackageReference Include="MoonSharp" Version="2.0.0" />
<PackageReference Include="NVorbis" Version="0.8.6" />
<PackageReference Include="RestSharp" Version="106.12.0" />

2
Barotrauma/BarotraumaClient/MacClient.csproj
View File

@@ -121,7 +121,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoMod.Common" Version="21.12.12.3" />
<PackageReference Include="MonoMod.Common" Version="22.1.20.1" />
<PackageReference Include="MoonSharp" Version="2.0.0" />
<PackageReference Include="NVorbis" Version="0.8.6" />
<PackageReference Include="RestSharp" Version="106.12.0" />

2
Barotrauma/BarotraumaClient/WindowsClient.csproj
View File

@@ -124,7 +124,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoMod.Common" Version="21.12.12.3" />
<PackageReference Include="MonoMod.Common" Version="22.1.20.1" />
<PackageReference Include="MoonSharp" Version="2.0.0" />
<PackageReference Include="NVorbis" Version="0.8.6" />
<PackageReference Include="RestSharp" Version="106.12.0" />

2
Barotrauma/BarotraumaServer/LinuxServer.csproj
View File

@@ -74,7 +74,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoMod.Common" Version="21.12.12.3" />
<PackageReference Include="MonoMod.Common" Version="22.1.20.1" />
<PackageReference Include="MoonSharp" Version="2.0.0" />
<PackageReference Include="RestSharp" Version="106.13.0" />
</ItemGroup>

2
Barotrauma/BarotraumaServer/MacServer.csproj
View File

@@ -81,7 +81,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoMod.Common" Version="21.12.12.3" />
<PackageReference Include="MonoMod.Common" Version="22.1.20.1" />
<PackageReference Include="MoonSharp" Version="2.0.0" />
<PackageReference Include="RestSharp" Version="106.13.0" />
</ItemGroup>

2
Barotrauma/BarotraumaServer/WindowsServer.csproj
View File

@@ -82,7 +82,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoMod.Common" Version="21.12.12.3" />
<PackageReference Include="MonoMod.Common" Version="22.1.20.1" />
<PackageReference Include="MoonSharp" Version="2.0.0" />
<PackageReference Include="RestSharp" Version="106.13.0" />
</ItemGroup>

12
Barotrauma/BarotraumaShared/SharedSource/Lua/LuaClasses.cs
View File

@@ -827,7 +827,7 @@ namespace Barotrauma
Before, After
}
static void _hookLuaPatch(MethodBase __originalMethod, object[] __params, object __instance, out LuaResult result, HookMethodType hookMethodType)
static void _hookLuaPatch(MethodBase __originalMethod, object[] __args, object __instance, out LuaResult result, HookMethodType hookMethodType)
{
// Although it works correctly, the performance is low
result = new LuaResult(null);
@@ -841,7 +841,7 @@ namespace Barotrauma
var ptable = new Dictionary<string, object>();
for (int i = 0; i < @params.Length; i++)
{
ptable.Add(@params[i].Name, __params[i]);
ptable.Add(@params[i].Name, __args[i]);
}
@@ -861,16 +861,16 @@ namespace Barotrauma
}
}
static bool HookLuaPatchPrefix(MethodBase __originalMethod, object[] __params, object __instance)
static bool HookLuaPatchPrefix(MethodBase __originalMethod, object[] __args, object __instance)
{
_hookLuaPatch(__originalMethod, __params, __instance, out LuaResult result, HookMethodType.Before);
_hookLuaPatch(__originalMethod, __args, __instance, out LuaResult result, HookMethodType.Before);
return result.IsNull();
}
static bool HookLuaPatchRetPrefix(MethodBase __originalMethod, object[] __params, ref object __result, object __instance)
static bool HookLuaPatchRetPrefix(MethodBase __originalMethod, object[] __args, ref object __result, object __instance)
{
_hookLuaPatch(__originalMethod, __params, __instance, out LuaResult result, HookMethodType.Before);
_hookLuaPatch(__originalMethod, __args, __instance, out LuaResult result, HookMethodType.Before);
if (!result.IsNull())
{

BIN
Libraries/0Harmony.dll
View File

Binary file not shown.