fix: ClientRpc methods now work accross assemblies (#1129)

Similar to #1128 but for client rpc
MirageNet · Oct 1, 2019 · 13dbcb9 · 13dbcb9
1 parent d8a98d8
commit 13dbcb9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/Assets/Mirror/Editor/Weaver/Processors/NetworkBehaviourProcessor.cs b/Assets/Mirror/Editor/Weaver/Processors/NetworkBehaviourProcessor.cs
@@ -786,17 +786,17 @@ void ProcessClientRpc(HashSet<string> names, MethodDefinition md, CustomAttribut
             names.Add(md.Name);
             clientRpcs.Add(md);
 
-            MethodDefinition rpcFunc = RpcProcessor.ProcessRpcInvoke(netBehaviourSubclass, md);
+            MethodDefinition rpcCallFunc = RpcProcessor.ProcessRpcCall(netBehaviourSubclass, md, ca);
+
+            MethodDefinition rpcFunc = RpcProcessor.ProcessRpcInvoke(netBehaviourSubclass, md, rpcCallFunc);
             if (rpcFunc != null)
             {
                 clientRpcInvocationFuncs.Add(rpcFunc);
             }
 
-            MethodDefinition rpcCallFunc = RpcProcessor.ProcessRpcCall(netBehaviourSubclass, md, ca);
             if (rpcCallFunc != null)
             {
                 clientRpcCallFuncs.Add(rpcCallFunc);
-                Weaver.WeaveLists.replaceMethods[md.FullName] = rpcCallFunc;
             }
         }
 

diff --git a/Assets/Mirror/Editor/Weaver/Processors/RpcProcessor.cs b/Assets/Mirror/Editor/Weaver/Processors/RpcProcessor.cs
@@ -7,7 +7,7 @@ public static class RpcProcessor
     {
         public const string RpcPrefix = "InvokeRpc";
 
-        public static MethodDefinition ProcessRpcInvoke(TypeDefinition td, MethodDefinition md)
+        public static MethodDefinition ProcessRpcInvoke(TypeDefinition td, MethodDefinition md, MethodDefinition rpcCallFunc)
         {
             MethodDefinition rpc = new MethodDefinition(
                 RpcPrefix + md.Name,
@@ -27,7 +27,7 @@ public static MethodDefinition ProcessRpcInvoke(TypeDefinition td, MethodDefinit
                 return null;
 
             // invoke actual command function
-            rpcWorker.Append(rpcWorker.Create(OpCodes.Callvirt, md));
+            rpcWorker.Append(rpcWorker.Create(OpCodes.Callvirt, rpcCallFunc));
             rpcWorker.Append(rpcWorker.Create(OpCodes.Ret));
 
             NetworkBehaviourProcessor.AddInvokeParameters(rpc.Parameters);
@@ -55,7 +55,12 @@ public static MethodDefinition ProcessRpcCall(TypeDefinition td, MethodDefinitio
                 rpc.Parameters.Add(new ParameterDefinition(pd.Name, ParameterAttributes.None, pd.ParameterType));
             }
 
-            ILProcessor rpcWorker = rpc.Body.GetILProcessor();
+            // move the old body to the new function
+            MethodBody newBody = rpc.Body;
+            rpc.Body = md.Body;
+            md.Body = newBody;
+
+            ILProcessor rpcWorker = md.Body.GetILProcessor();
 
             NetworkBehaviourProcessor.WriteSetupLocals(rpcWorker);