From 7cdd35cc8d76964c487590b1121fda81a6bcba8a Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Mon, 13 Mar 2023 20:36:10 +0100 Subject: [PATCH] Fix network codegen for 6 or more param RPC in C# --- .../Flax.Build/Build/Plugins/NetworkingPlugin.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Source/Tools/Flax.Build/Build/Plugins/NetworkingPlugin.cs b/Source/Tools/Flax.Build/Build/Plugins/NetworkingPlugin.cs index 5dccfccc4..99ded7da1 100644 --- a/Source/Tools/Flax.Build/Build/Plugins/NetworkingPlugin.cs +++ b/Source/Tools/Flax.Build/Build/Plugins/NetworkingPlugin.cs @@ -531,9 +531,6 @@ namespace Flax.Build.Plugins { if (type.IsInterface || type.IsEnum) continue; - var isNative = type.HasAttribute("FlaxEngine.UnmanagedAttribute"); - if (isNative) - continue; // Generate RPCs var methods = type.Methods; @@ -545,9 +542,14 @@ namespace Flax.Build.Plugins if (attribute != null) { GenerateDotNetRPCBody(type, method, attribute, ref failed, networkStreamType, methodRPCs); + modified = true; } } + var isNative = type.HasAttribute("FlaxEngine.UnmanagedAttribute"); + if (isNative) + continue; + // Generate serializers if (type.HasMethod(Thunk1) || type.HasMethod(Thunk2)) continue; @@ -1402,10 +1404,10 @@ namespace Flax.Build.Plugins // || il.InsertBefore(ilStart, jumpIf2Start); il.InsertBefore(ilStart, il.Create(OpCodes.Ldloc, varsStart + 1)); - il.InsertBefore(ilStart, il.Create(OpCodes.Brfalse_S, jumpBodyStart)); + il.InsertBefore(ilStart, il.Create(OpCodes.Brfalse, jumpBodyStart)); il.InsertBefore(ilStart, il.Create(OpCodes.Ldloc, varsStart + 2)); il.InsertBefore(ilStart, il.Create(OpCodes.Ldc_I4_2)); - il.InsertBefore(ilStart, il.Create(OpCodes.Beq_S, jumpBodyStart)); + il.InsertBefore(ilStart, il.Create(OpCodes.Beq, jumpBodyStart)); // { il.InsertBefore(ilStart, jumpIfBodyStart);