fix: unique handlers per rpc method

com.unity.netcode.gameobjects/CHANGELOG.md

@@ -7,12 +7,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 Additional documentation and release notes are available at [Multiplayer Documentation](https://docs-multiplayer.unity3d.com).
 
 ## [Unreleased]
+
 ### Added
+
 ### Changed
 
 ### Fixed
-- Fixed: Issue where Alpha release versions of Unity (version 20202.2.0a5 and later) will not compile due to the UNet Transport no longer existing (#1678)
 
+- Fixed an issue where Alpha release versions of Unity (version 20202.2.0a5 and later) will not compile due to the UNet Transport no longer existing (#1678)
+- Fixed overloading RPC methods causing collisions and failing on IL2CPP targets. (#1694)
 
 ## [1.0.0-pre.5] - 2022-01-26
 

com.unity.netcode.gameobjects/Editor/CodeGen/NetworkBehaviourILPP.cs

@@ -397,7 +397,7 @@ private void ProcessNetworkBehaviour(TypeDefinition typeDefinition, string[] ass
 
                 InjectWriteAndCallBlocks(methodDefinition, rpcAttribute, rpcMethodId);
 
-                rpcHandlers.Add((rpcMethodId, GenerateStaticHandler(methodDefinition, rpcAttribute)));
+                rpcHandlers.Add((rpcMethodId, GenerateStaticHandler(methodDefinition, rpcAttribute, rpcMethodId)));
 
                 if (isEditorOrDevelopment)
                 {
@@ -1132,18 +1132,18 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA
             instructions.ForEach(instruction => processor.Body.Instructions.Insert(0, instruction));
         }
 
-        private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition, CustomAttribute rpcAttribute)
+        private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition, CustomAttribute rpcAttribute, uint rpcMethodId)
         {
             var typeSystem = methodDefinition.Module.TypeSystem;
-            var nhandler = new MethodDefinition(
-                $"{methodDefinition.Name}__nhandler",
+            var rpcHandler = new MethodDefinition(
+                $"__rpc_handler_{rpcMethodId}",
                 MethodAttributes.Private | MethodAttributes.Static | MethodAttributes.HideBySig,
                 methodDefinition.Module.TypeSystem.Void);
-            nhandler.Parameters.Add(new ParameterDefinition("target", ParameterAttributes.None, m_NetworkBehaviour_TypeRef));
-            nhandler.Parameters.Add(new ParameterDefinition("reader", ParameterAttributes.None, m_FastBufferReader_TypeRef));
-            nhandler.Parameters.Add(new ParameterDefinition("rpcParams", ParameterAttributes.None, m_RpcParams_TypeRef));
+            rpcHandler.Parameters.Add(new ParameterDefinition("target", ParameterAttributes.None, m_NetworkBehaviour_TypeRef));
+            rpcHandler.Parameters.Add(new ParameterDefinition("reader", ParameterAttributes.None, m_FastBufferReader_TypeRef));
+            rpcHandler.Parameters.Add(new ParameterDefinition("rpcParams", ParameterAttributes.None, m_RpcParams_TypeRef));
 
-            var processor = nhandler.Body.GetILProcessor();
+            var processor = rpcHandler.Body.GetILProcessor();
 
             // begin Try/Catch
             var tryStart = processor.Create(OpCodes.Nop);
@@ -1161,10 +1161,10 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition
                 }
             }
 
-            nhandler.Body.InitLocals = true;
+            rpcHandler.Body.InitLocals = true;
             // NetworkManager networkManager;
-            nhandler.Body.Variables.Add(new VariableDefinition(m_NetworkManager_TypeRef));
-            int netManLocIdx = nhandler.Body.Variables.Count - 1;
+            rpcHandler.Body.Variables.Add(new VariableDefinition(m_NetworkManager_TypeRef));
+            int netManLocIdx = rpcHandler.Body.Variables.Count - 1;
 
             {
                 var returnInstr = processor.Create(OpCodes.Ret);
@@ -1233,8 +1233,8 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition
                 var paramType = paramDef.ParameterType;
 
                 // local variable
-                nhandler.Body.Variables.Add(new VariableDefinition(paramType));
-                int localIndex = nhandler.Body.Variables.Count - 1;
+                rpcHandler.Body.Variables.Add(new VariableDefinition(paramType));
+                int localIndex = rpcHandler.Body.Variables.Count - 1;
                 paramLocalMap[paramIndex] = localIndex;
 
                 // ServerRpcParams, ClientRpcParams
@@ -1268,8 +1268,8 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition
                     }
 
                     // reader.ReadValueSafe(out bool isSet)
-                    nhandler.Body.Variables.Add(new VariableDefinition(typeSystem.Boolean));
-                    int isSetLocalIndex = nhandler.Body.Variables.Count - 1;
+                    rpcHandler.Body.Variables.Add(new VariableDefinition(typeSystem.Boolean));
+                    int isSetLocalIndex = rpcHandler.Body.Variables.Count - 1;
                     processor.Emit(OpCodes.Ldarga, 1);
                     processor.Emit(OpCodes.Ldloca, isSetLocalIndex);
                     processor.Emit(OpCodes.Call, boolMethodRef);
@@ -1345,8 +1345,8 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition
             // Get String.Format (This is equivalent to an interpolated string)
             var stringFormat = m_MainModule.ImportReference(typeof(string).GetMethod("Format", new Type[] { typeof(string), typeof(object) }));
 
-            nhandler.Body.Variables.Add(new VariableDefinition(exception));
-            int exceptionVariableIndex = nhandler.Body.Variables.Count - 1;
+            rpcHandler.Body.Variables.Add(new VariableDefinition(exception));
+            int exceptionVariableIndex = rpcHandler.Body.Variables.Count - 1;
 
             //try ends/catch begins
             var catchEnds = processor.Create(OpCodes.Nop);
@@ -1384,7 +1384,7 @@ private MethodDefinition GenerateStaticHandler(MethodDefinition methodDefinition
 
             processor.Emit(OpCodes.Ret);
 
-            return nhandler;
+            return rpcHandler;
         }
     }
 }

testproject/Assets/Tests/Manual/HybridScripts/RpcQueueManualTests.cs

@@ -423,6 +423,7 @@ private void Update()
                                 }
                                 m_GlobalCounter++;
                                 OnSendGlobalCounterClientRpc(m_GlobalCounter);
+                                OnSendGlobalCounterClientRpc((float)m_GlobalCounter);
                                 m_RpcMessagesSent++;
                             }
 
@@ -704,6 +705,21 @@ private void OnSendGlobalCounterClientRpc(int counter)
             }
         }
 
+        /// <summary>
+        /// [Tests] Server to Clients
+        /// [Tests] broadcasting to all clients (similar to unified direct without specifying all client ids)
+        /// </summary>
+        /// <param name="counter">the global counter value</param>
+        [ClientRpc]
+        private void OnSendGlobalCounterClientRpc(float counter)
+        {
+            m_GlobalCounter = (int)counter;
+            if (m_GlobalCounterOffset == 0)
+            {
+                m_GlobalCounterOffset = Mathf.Max(m_GlobalCounter - 1, 0);
+            }
+        }
+
         /// <summary>
         /// Server to Client
         /// Handles setting the m_GlobalDirectCounter for the client in questions