feat: Commands no longer need to start with Cmd (#263)

Co-authored-by: Paul Pacheco <paul.pacheco@aa.com>
MirageNet · Jul 12, 2020 · 9578e19 · 9578e19
1 parent 50e7fa6
commit 9578e19
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 26 deletions.
diff --git a/Assets/Mirror/Editor/Weaver/Processors/CommandProcessor.cs b/Assets/Mirror/Editor/Weaver/Processors/CommandProcessor.cs
@@ -142,12 +142,6 @@ static void AddSenderConnection(MethodDefinition method, ILProcessor worker)
 
         public static bool ProcessMethodsValidateCommand(MethodDefinition md)
         {
-            if (!md.Name.StartsWith("Cmd"))
-            {
-                Weaver.Error($"{md.Name} must start with Cmd.  Consider renaming it to Cmd{md.Name}", md);
-                return false;
-            }
-
             if (md.IsStatic)
             {
                 Weaver.Error($"{md.Name} cannot be static", md);

diff --git a/Assets/Mirror/Tests/Editor/Weaver/WeaverCommandTests.cs b/Assets/Mirror/Tests/Editor/Weaver/WeaverCommandTests.cs
@@ -10,12 +10,6 @@ public void CommandValid()
             Assert.That(weaverErrors, Is.Empty);
         }
 
-        [Test]
-        public void CommandStartsWithCmd()
-        {
-            Assert.That(weaverErrors, Contains.Item("DoesntStartWithCmd must start with Cmd.  Consider renaming it to CmdDoesntStartWithCmd (at System.Void WeaverCommandTests.CommandStartsWithCmd.CommandStartsWithCmd::DoesntStartWithCmd())"));
-        }
-
         [Test]
         public void CommandCantBeStatic()
         {

diff --git a/Assets/Mirror/Tests/Editor/Weaver/WeaverCommandTests~/CommandStartsWithCmd.cs b/Assets/Mirror/Tests/Editor/Weaver/WeaverCommandTests~/CommandStartsWithCmd.cs
diff --git a/Assets/Mirror/Tests/Runtime/ClientServerComponentTests.cs b/Assets/Mirror/Tests/Runtime/ClientServerComponentTests.cs
@@ -49,7 +49,7 @@ public void CheckNotHost()
         [UnityTest]
         public IEnumerator Command() => RunAsync(async () =>
         {
-            clientComponent.CmdTest(1, "hello");
+            clientComponent.Test(1, "hello");
 
             await WaitFor(() => serverComponent.cmdArg1 != 0);
 

diff --git a/Assets/Mirror/Tests/Runtime/HostComponentTests.cs b/Assets/Mirror/Tests/Runtime/HostComponentTests.cs
@@ -26,15 +26,15 @@ public void CommandWithoutAuthority()
             // only authorized clients can call command
             Assert.Throws<UnauthorizedAccessException>(() =>
            {
-               rpcComponent2.CmdTest(1, "hello");
+               rpcComponent2.Test(1, "hello");
            });
 
         }
 
         [UnityTest]
         public IEnumerator Command() => RunAsync(async () =>
         {
-            component.CmdTest(1, "hello");
+            component.Test(1, "hello");
 
             await WaitFor(() => component.cmdArg1 != 0);
 

diff --git a/Assets/Mirror/Tests/Runtime/MockComponent.cs b/Assets/Mirror/Tests/Runtime/MockComponent.cs
@@ -6,7 +6,7 @@ public class MockComponent : NetworkBehaviour
         public string cmdArg2;
 
         [Command]
-        public void CmdTest(int arg1, string arg2)
+        public void Test(int arg1, string arg2)
         {
             this.cmdArg1 = arg1;
             this.cmdArg2 = arg2;