fix: ClientRPC should skip first arg only if set as Connection (#315)

* fix: (Weaver)ClientRPC should skip first arg only if set as Connection * rename var
MirageNet · Jul 31, 2020 · 168e622 · 168e622
1 parent b4d65a7
commit 168e622
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/Assets/Mirror/Editor/Weaver/Processors/NetworkBehaviourProcessor.cs b/Assets/Mirror/Editor/Weaver/Processors/NetworkBehaviourProcessor.cs
@@ -779,17 +779,14 @@ void GenerateDeSerialization()
             netBehaviourSubclass.Methods.Add(serialize);
         }
 
-        public static bool ReadArguments(MethodDefinition method, ILProcessor worker, RemoteCallType callType)
+        public static bool ReadArguments(MethodDefinition method, ILProcessor worker, bool skipFirst)
         {
             // read each argument
             // example result
             /*
             CallCmdDoSomething(reader.ReadPackedInt32(), reader.ReadNetworkIdentity());
              */
 
-            bool skipFirst = callType == RemoteCallType.ClientRpc
-                && RpcProcessor.HasNetworkConnectionParameter(method);
-
             // arg of calling  function, arg 0 is "this" so start counting at 1
             int argNum = 1;
             foreach (ParameterDefinition param in method.Parameters)

diff --git a/Assets/Mirror/Editor/Weaver/Processors/RpcProcessor.cs b/Assets/Mirror/Editor/Weaver/Processors/RpcProcessor.cs
@@ -53,15 +53,17 @@ public static MethodDefinition GenerateSkeleton(MethodDefinition md, MethodDefin
             worker.Append(worker.Create(OpCodes.Castclass, md.DeclaringType));
 
             // NetworkConnection parameter is only required for Client.Connection
-            Client target = clientRpcAttr.GetField("target", Client.Observers); 
-            if (target == Client.Connection && HasNetworkConnectionParameter(md))
+            Client target = clientRpcAttr.GetField("target", Client.Observers);
+            bool hasNetworkConnection = target == Client.Connection && HasNetworkConnectionParameter(md);
+
+            if (hasNetworkConnection)
             {
                 //client.connection
                 worker.Append(worker.Create(OpCodes.Ldarg_0));
                 worker.Append(worker.Create(OpCodes.Call, Weaver.BehaviorConnectionToServerReference));
             }
-
-            if (!NetworkBehaviourProcessor.ReadArguments(md, worker, RemoteCallType.ClientRpc))
+            
+            if (!NetworkBehaviourProcessor.ReadArguments(md, worker, hasNetworkConnection))
                 return null;
 
             // invoke actual ServerRpc function

diff --git a/Assets/Mirror/Editor/Weaver/Processors/ServerRpcProcessor.cs b/Assets/Mirror/Editor/Weaver/Processors/ServerRpcProcessor.cs
@@ -111,7 +111,7 @@ public static MethodDefinition GenerateSkeleton(MethodDefinition method, MethodD
             worker.Append(worker.Create(OpCodes.Ldarg_0));
             worker.Append(worker.Create(OpCodes.Castclass, method.DeclaringType));
 
-            if (!NetworkBehaviourProcessor.ReadArguments(method, worker, RemoteCallType.ServerRpc))
+            if (!NetworkBehaviourProcessor.ReadArguments(method, worker, false))
                 return null;
 
             AddSenderConnection(method, worker);

diff --git a/Assets/Mirror/Editor/Weaver/Processors/SyncEventProcessor.cs b/Assets/Mirror/Editor/Weaver/Processors/SyncEventProcessor.cs
@@ -53,7 +53,7 @@ public static MethodDefinition ProcessEventInvoke(TypeDefinition td, EventDefini
 
             // read the event arguments
             MethodReference invoke = Resolvers.ResolveMethod(eventField.FieldType, Weaver.CurrentAssembly, "Invoke");
-            if (!NetworkBehaviourProcessor.ReadArguments(invoke.Resolve(), worker, RemoteCallType.SyncEvent))
+            if (!NetworkBehaviourProcessor.ReadArguments(invoke.Resolve(), worker, false))
                 return null;
 
             // invoke actual event delegate function