fix: build in IL2CPP (#1524)

The weaver generated code now builds properly under IL2CPP fixes #1519 fixes #1520
MirageNet · Feb 27, 2020 · 59faa81 · 59faa81
1 parent ae451e6
commit 59faa81
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Assets/Mirror/Editor/Weaver/Processors/NetworkBehaviourProcessor.cs b/Assets/Mirror/Editor/Weaver/Processors/NetworkBehaviourProcessor.cs
@@ -100,7 +100,7 @@ public static void WriteServerActiveCheck(ILProcessor worker, string mdName, Ins
         public static void WriteSetupLocals(ILProcessor worker)
         {
             worker.Body.InitLocals = true;
-            worker.Body.Variables.Add(new VariableDefinition(Weaver.CurrentAssembly.MainModule.ImportReference(Weaver.NetworkWriterType)));
+            worker.Body.Variables.Add(new VariableDefinition(Weaver.PooledNetworkWriterType));
         }
 
         public static void WriteCreateWriter(ILProcessor worker)

diff --git a/Assets/Mirror/Editor/Weaver/Weaver.cs b/Assets/Mirror/Editor/Weaver/Weaver.cs
@@ -64,6 +64,7 @@ class Weaver
         public static TypeReference NetworkReaderType;
 
         public static TypeReference NetworkWriterType;
+        public static TypeReference PooledNetworkWriterType;
 
         public static TypeReference NetworkIdentityType;
         public static TypeReference IEnumeratorType;
@@ -252,6 +253,8 @@ static void SetupTargetTypes()
 
             NetworkReaderType = NetAssembly.MainModule.GetType("Mirror.NetworkReader");
             NetworkWriterType = NetAssembly.MainModule.GetType("Mirror.NetworkWriter");
+            TypeReference pooledNetworkWriterTmp = NetAssembly.MainModule.GetType("Mirror.PooledNetworkWriter");
+            PooledNetworkWriterType = CurrentAssembly.MainModule.ImportReference(pooledNetworkWriterTmp);
 
             NetworkServerGetActive = Resolvers.ResolveMethod(NetworkServerType, CurrentAssembly, "get_active");
             NetworkServerGetLocalClientActive = Resolvers.ResolveMethod(NetworkServerType, CurrentAssembly, "get_localClientActive");