fix: renaming call/invoke prefix for SyncEvent (#2089)

* renaming sync event same reason as #2088 * removing un-used const
MirageNet · Jul 13, 2020 · 18d6957 · 18d6957
1 parent 64f663f
commit 18d6957
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Assets/Mirror/Editor/Weaver/Processors/PropertySiteProcessor.cs b/Assets/Mirror/Editor/Weaver/Processors/PropertySiteProcessor.cs
@@ -57,7 +57,7 @@ static void ProcessSiteMethod(TypeDefinition td, MethodDefinition md)
 
             if (md.Name == ".cctor" ||
                 md.Name == NetworkBehaviourProcessor.ProcessedFunctionName ||
-                md.Name.StartsWith("InvokeSyn"))
+                md.Name.StartsWith(Weaver.InvokeRpcPrefix))
                 return;
 
             if (md.Body != null && md.Body.Instructions != null)

diff --git a/Assets/Mirror/Editor/Weaver/Processors/SyncEventProcessor.cs b/Assets/Mirror/Editor/Weaver/Processors/SyncEventProcessor.cs
@@ -27,7 +27,7 @@ public static MethodDefinition ProcessEventInvoke(TypeDefinition td, EventDefini
                 return null;
             }
 
-            MethodDefinition cmd = new MethodDefinition("InvokeSyncEvent" + ed.Name, MethodAttributes.Family |
+            MethodDefinition cmd = new MethodDefinition(Weaver.InvokeRpcPrefix + ed.Name, MethodAttributes.Family |
                     MethodAttributes.Static |
                     MethodAttributes.HideBySig,
                     Weaver.voidType);
@@ -68,7 +68,7 @@ public static MethodDefinition ProcessEventInvoke(TypeDefinition td, EventDefini
         public static MethodDefinition ProcessEventCall(TypeDefinition td, EventDefinition ed, CustomAttribute syncEventAttr)
         {
             MethodReference invoke = Resolvers.ResolveMethod(ed.EventType, Weaver.CurrentAssembly, "Invoke");
-            MethodDefinition evt = new MethodDefinition("Call" + ed.Name, MethodAttributes.Public |
+            MethodDefinition evt = new MethodDefinition(Weaver.SyncEventPrefix + ed.Name, MethodAttributes.Public |
                     MethodAttributes.HideBySig,
                     Weaver.voidType);
             // add paramters

diff --git a/Assets/Mirror/Editor/Weaver/Weaver.cs b/Assets/Mirror/Editor/Weaver/Weaver.cs
@@ -31,6 +31,7 @@ internal static class Weaver
     {
         public static string InvokeRpcPrefix => "InvokeUserCode_";
         public static string RpcPrefix => "UserCode_";
+        public static string SyncEventPrefix => "SendEventMessage_";
 
         public static WeaverLists WeaveLists { get; private set; }
         public static AssemblyDefinition CurrentAssembly { get; private set; }