fix: Compilation error when using an RpcAttribute with RequireOwnership

Author: EmandM

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

@@ -1654,34 +1654,25 @@ private CustomAttribute CheckAndGetRpcAttribute(MethodDefinition methodDefinitio
                 return null;
             }
 
-            var typeSystem = methodDefinition.Module.TypeSystem;
-            var hasInvokePermission = false;
+            bool hasInvokePermission = false, hasRequireOwnership = false;
 
-            CustomAttributeNamedArgument? invokePermissionAttribute = null;
             foreach (var argument in rpcAttribute.Fields)
             {
                 switch (argument.Name)
                 {
                     case k_ServerRpcAttribute_RequireOwnership:
-                        var requireOwnership = argument.Argument.Type == typeSystem.Boolean && (bool)argument.Argument.Value;
-                        var invokePermissionArg = new CustomAttributeArgument(m_RpcInvokePermissions_TypeRef, requireOwnership ? RpcInvokePermission.Owner : RpcInvokePermission.Everyone);
-                        invokePermissionAttribute = new CustomAttributeNamedArgument(k_RpcAttribute_InvokePermission, invokePermissionArg);
+                        hasRequireOwnership = true;
                         break;
                     case k_RpcAttribute_InvokePermission:
                         hasInvokePermission = true;
                         break;
                 }
             }
 
-            if (invokePermissionAttribute != null)
+            if (hasInvokePermission && hasRequireOwnership)
             {
-                if (hasInvokePermission)
-                {
-                    m_Diagnostics.AddError($"{methodDefinition.Name} cannot declare both RequireOwnership and InvokePermission!");
-                    return null;
-                }
-
-                rpcAttribute.Fields.Add(invokePermissionAttribute.Value);
+                m_Diagnostics.AddError($"{methodDefinition.Name} cannot declare both RequireOwnership and InvokePermission!");
+                return null;
             }
 
 

com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviour.cs

@@ -335,7 +335,11 @@ internal FastBufferWriter __beginSendRpc(uint rpcMethodId, RpcParams rpcParams,
                 throw new RpcException("This RPC can only be sent by the server.");
             }
 
-            if (attributeParams.InvokePermission == RpcInvokePermission.Owner && !IsOwner)
+#pragma warning disable CS0618 // Type or member is obsolete
+            var requireOwnership = attributeParams.RequireOwnership;
+#pragma warning restore CS0618 // Type or member is obsolete
+
+            if ((requireOwnership || attributeParams.InvokePermission == RpcInvokePermission.Owner) && !IsOwner)
             {
                 throw new RpcException("This RPC can only be sent by its owner.");
             }

com.unity.netcode.gameobjects/Tests/Runtime/Rpc/RpcInvocationTests.cs

@@ -98,11 +98,13 @@ public IEnumerator RpcInvokePermissionSendingTests()
             foreach (var (manager, instance) in m_InvokeInstances)
             {
                 instance.ExpectedCallCounts[nameof(InvokePermissionBehaviour.OwnerInvokePermissionRpc)] = 1;
+                instance.ExpectedCallCounts[nameof(InvokePermissionBehaviour.OwnerRequireOwnershipRpc)] = 1;
 
                 var threwException = false;
                 try
                 {
                     instance.OwnerInvokePermissionRpc();
+                    instance.OwnerRequireOwnershipRpc();
                 }
                 catch (RpcException)
                 {
@@ -167,8 +169,10 @@ public IEnumerator RpcInvokePermissionReceivingTests()
             foreach (var (manager, instance) in m_InvokeInstances)
             {
                 instance.ExpectedCallCounts[nameof(InvokePermissionBehaviour.OwnerInvokePermissionRpc)] = 1;
+                instance.ExpectedCallCounts[nameof(InvokePermissionBehaviour.OwnerRequireOwnershipRpc)] = 1;
 
                 SendUncheckedMessage(manager, instance, nameof(InvokePermissionBehaviour.OwnerInvokePermissionRpc));
+                SendUncheckedMessage(manager, instance, nameof(InvokePermissionBehaviour.OwnerRequireOwnershipRpc));
             }
 
             yield return WaitForConditionOrTimeOut(AllExpectedCallsReceived);
@@ -445,6 +449,15 @@ public void ServerInvokePermissionRpc()
             TrackRpcCalled(GetCaller());
         }
 
+
+#pragma warning disable CS0618 // Type or member is obsolete
+        [Rpc(SendTo.Everyone, RequireOwnership = true)]
+#pragma warning restore CS0618 // Type or member is obsolete
+        public void OwnerRequireOwnershipRpc()
+        {
+            TrackRpcCalled(GetCaller());
+        }
+
         [Rpc(SendTo.Everyone, InvokePermission = RpcInvokePermission.Owner)]
         public void OwnerInvokePermissionRpc()
         {