fix: weaver Cmd/Rpc/Target prefix check is no longer trash (#707)

* fix: weaver Cmd prefix check should not allow methods with names shorter than 3 characters. * fix: weaver Rpc prefix check should not allow methods with names shorter than 3 characters. * fix: weaver Target prefix check should not allow methods with names shorter than 6 characters. * Update Assets/Mirror/Editor/Weaver/Processors/CommandProcessor.cs Co-Authored-By: rodolphito <rodol@rivalrebels.com> * Update Assets/Mirror/Editor/Weaver/Processors/TargetRpcProcessor.cs Co-Authored-By: rodolphito <rodol@rivalrebels.com> * Update Assets/Mirror/Editor/Weaver/Processors/RpcProcessor.cs Co-Authored-By: rodolphito <rodol@rivalrebels.com>
MirageNet · Apr 4, 2019 · 699a261 · 699a261
1 parent 9895647
commit 699a261
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/Assets/Mirror/Editor/Weaver/Processors/CommandProcessor.cs b/Assets/Mirror/Editor/Weaver/Processors/CommandProcessor.cs
@@ -132,7 +132,7 @@ public static MethodDefinition ProcessCommandInvoke(TypeDefinition td, MethodDef
 
         public static bool ProcessMethodsValidateCommand(TypeDefinition td, MethodDefinition md, CustomAttribute ca)
         {
-            if (md.Name.Length > 2 && md.Name.Substring(0, 3) != "Cmd")
+            if (!md.Name.StartsWith("Cmd"))
             {
                 Weaver.Error("Command function [" + td.FullName + ":" + md.Name + "] doesnt have 'Cmd' prefix");
                 return false;

diff --git a/Assets/Mirror/Editor/Weaver/Processors/RpcProcessor.cs b/Assets/Mirror/Editor/Weaver/Processors/RpcProcessor.cs
@@ -89,7 +89,7 @@ public static MethodDefinition ProcessRpcCall(TypeDefinition td, MethodDefinitio
 
         public static bool ProcessMethodsValidateRpc(TypeDefinition td, MethodDefinition md, CustomAttribute ca)
         {
-            if (md.Name.Length > 2 && md.Name.Substring(0, 3) != "Rpc")
+            if (!md.Name.StartsWith("Rpc"))
             {
                 Weaver.Error("Rpc function [" + td.FullName + ":" + md.Name + "] doesnt have 'Rpc' prefix");
                 return false;

diff --git a/Assets/Mirror/Editor/Weaver/Processors/TargetRpcProcessor.cs b/Assets/Mirror/Editor/Weaver/Processors/TargetRpcProcessor.cs
@@ -125,10 +125,7 @@ public static MethodDefinition ProcessTargetRpcCall(TypeDefinition td, MethodDef
 
         public static bool ProcessMethodsValidateTargetRpc(TypeDefinition td, MethodDefinition md, CustomAttribute ca)
         {
-            const string targetPrefix = "Target";
-            int prefixLen = targetPrefix.Length;
-
-            if (md.Name.Length > prefixLen && md.Name.Substring(0, prefixLen) != targetPrefix)
+            if (!md.Name.StartsWith("Target"))
             {
                 Weaver.Error("Target Rpc function [" + td.FullName + ":" + md.Name + "] doesnt have 'Target' prefix");
                 return false;