diff --git a/Assets/Mirror/Editor/Weaver/Processors/RpcProcessor.cs b/Assets/Mirror/Editor/Weaver/Processors/RpcProcessor.cs index e8a2642ab61..aee473d2ac7 100644 --- a/Assets/Mirror/Editor/Weaver/Processors/RpcProcessor.cs +++ b/Assets/Mirror/Editor/Weaver/Processors/RpcProcessor.cs @@ -112,12 +112,6 @@ public static MethodDefinition ProcessRpcCall(TypeDefinition td, MethodDefinitio public static bool ProcessMethodsValidateRpc(MethodDefinition md) { - if (!md.Name.StartsWith("Rpc")) - { - Weaver.Error($"{md.Name} must start with Rpc. Consider renaming it to Rpc{md.Name}", md); - return false; - } - if (md.IsStatic) { Weaver.Error($"{md.Name} must not be static", md); diff --git a/Assets/Mirror/Tests/Editor/ClientRpcTest.cs b/Assets/Mirror/Tests/Editor/ClientRpcTest.cs index aad930c21ca..feac81c1580 100644 --- a/Assets/Mirror/Tests/Editor/ClientRpcTest.cs +++ b/Assets/Mirror/Tests/Editor/ClientRpcTest.cs @@ -8,7 +8,7 @@ class ClientRpcBehaviour : NetworkBehaviour public event Action onSendInt; [ClientRpc] - public void RpcSendInt(int someInt) + public void SendInt(int someInt) { onSendInt?.Invoke(someInt); } @@ -40,7 +40,7 @@ public void RpcIsCalled() callCount++; Assert.That(incomingInt, Is.EqualTo(someInt)); }; - hostBehaviour.RpcSendInt(someInt); + hostBehaviour.SendInt(someInt); ProcessMessages(); Assert.That(callCount, Is.EqualTo(1)); } diff --git a/Assets/Mirror/Tests/Editor/Weaver/WeaverClientRpcTests.cs b/Assets/Mirror/Tests/Editor/Weaver/WeaverClientRpcTests.cs index e0dc1742382..b6d9a8bff65 100644 --- a/Assets/Mirror/Tests/Editor/Weaver/WeaverClientRpcTests.cs +++ b/Assets/Mirror/Tests/Editor/Weaver/WeaverClientRpcTests.cs @@ -10,12 +10,6 @@ public void ClientRpcValid() Assert.That(weaverErrors, Is.Empty); } - [Test] - public void ClientRpcStartsWithRpc() - { - Assert.That(weaverErrors, Contains.Item("DoesntStartWithRpc must start with Rpc. Consider renaming it to RpcDoesntStartWithRpc (at System.Void WeaverClientRpcTests.ClientRpcStartsWithRpc.ClientRpcStartsWithRpc::DoesntStartWithRpc())")); - } - [Test] public void ClientRpcCantBeStatic() { diff --git a/Assets/Mirror/Tests/Editor/Weaver/WeaverClientRpcTests~/ClientRpcStartsWithRpc.cs b/Assets/Mirror/Tests/Editor/Weaver/WeaverClientRpcTests~/ClientRpcStartsWithRpc.cs deleted file mode 100644 index 3eb9064e3a5..00000000000 --- a/Assets/Mirror/Tests/Editor/Weaver/WeaverClientRpcTests~/ClientRpcStartsWithRpc.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Mirror; - -namespace WeaverClientRpcTests.ClientRpcStartsWithRpc -{ - class ClientRpcStartsWithRpc : NetworkBehaviour - { - [ClientRpc] - void DoesntStartWithRpc() { } - } -}