vlad.os/LuaCsForBarotraumaEP
0
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
Barotrauma/BarotraumaClient/LinuxClient.csproj
+1 -1
View File
@@ -120,7 +120,7 @@
</ItemGroup> </ItemGroup>
<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="MoonSharp" Version="2.0.0" />
<PackageReference Include="NVorbis" Version="0.8.6" /> <PackageReference Include="NVorbis" Version="0.8.6" />
<PackageReference Include="RestSharp" Version="106.12.0" /> <PackageReference Include="RestSharp" Version="106.12.0" />
Barotrauma/BarotraumaClient/MacClient.csproj
+1 -1
View File
@@ -121,7 +121,7 @@
</ItemGroup> </ItemGroup>
<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="MoonSharp" Version="2.0.0" />
<PackageReference Include="NVorbis" Version="0.8.6" /> <PackageReference Include="NVorbis" Version="0.8.6" />
<PackageReference Include="RestSharp" Version="106.12.0" /> <PackageReference Include="RestSharp" Version="106.12.0" />
Barotrauma/BarotraumaClient/WindowsClient.csproj
+1 -1
View File
@@ -124,7 +124,7 @@
</ItemGroup> </ItemGroup>
<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="MoonSharp" Version="2.0.0" />
<PackageReference Include="NVorbis" Version="0.8.6" /> <PackageReference Include="NVorbis" Version="0.8.6" />
<PackageReference Include="RestSharp" Version="106.12.0" /> <PackageReference Include="RestSharp" Version="106.12.0" />
Barotrauma/BarotraumaServer/LinuxServer.csproj
+1 -1
View File
@@ -74,7 +74,7 @@
</ItemGroup> </ItemGroup>
<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="MoonSharp" Version="2.0.0" />
<PackageReference Include="RestSharp" Version="106.13.0" /> <PackageReference Include="RestSharp" Version="106.13.0" />
</ItemGroup> </ItemGroup>
Barotrauma/BarotraumaServer/MacServer.csproj
+1 -1
View File
@@ -81,7 +81,7 @@
</ItemGroup> </ItemGroup>
<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="MoonSharp" Version="2.0.0" />
<PackageReference Include="RestSharp" Version="106.13.0" /> <PackageReference Include="RestSharp" Version="106.13.0" />
</ItemGroup> </ItemGroup>
Barotrauma/BarotraumaServer/WindowsServer.csproj
+1 -1
View File
@@ -82,7 +82,7 @@
</ItemGroup> </ItemGroup>
<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="MoonSharp" Version="2.0.0" />
<PackageReference Include="RestSharp" Version="106.13.0" /> <PackageReference Include="RestSharp" Version="106.13.0" />
</ItemGroup> </ItemGroup>
Barotrauma/BarotraumaShared/SharedSource/Lua/LuaClasses.cs
+6 -6
View File
@@ -827,7 +827,7 @@ namespace Barotrauma
Before, After 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 // Although it works correctly, the performance is low
result = new LuaResult(null); result = new LuaResult(null);
@@ -841,7 +841,7 @@ namespace Barotrauma
var ptable = new Dictionary<string, object>(); var ptable = new Dictionary<string, object>();
for (int i = 0; i < @params.Length; i++) 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(); 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()) if (!result.IsNull())
{ {
Libraries/0Harmony.dll
BIN
View File
Binary file not shown.