2026-04-06 23:57:33 +03:00
869 changed files with 3675 additions and 2764 deletions
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Extension/FieldDefinitionExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Extension/FieldReferenceExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Extension/ILProcessorExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -111,18 +111,9 @@ namespace FishNet.CodeGenerating.Extension

            foreach (ParameterDefinition pd in otherMd.Parameters)
            {
-                session.ImportReference(pd.ParameterType.CachedResolve(session));
                int currentCount = thisMd.Parameters.Count;
                string name = pd.Name + currentCount;
-                ParameterDefinition parameterDef = new(name, pd.Attributes, pd.ParameterType);
-                // Set any default values.
-                parameterDef.Constant = pd.Constant;
-                parameterDef.IsReturnValue = pd.IsReturnValue;
-                parameterDef.IsOut = pd.IsOut;
-                foreach (CustomAttribute item in pd.CustomAttributes)
-                    parameterDef.CustomAttributes.Add(item);
-                parameterDef.HasConstant = pd.HasConstant;
-                parameterDef.HasDefault = pd.HasDefault;
+                ParameterDefinition parameterDef = pd.CloneImported(session, thisMd, name);

                if (parameterDef == null || thisMd.Parameters == null)
                {
@@ -156,17 +147,14 @@ namespace FishNet.CodeGenerating.Extension
                    DeclaringType = git,
                    CallingConvention = md.CallingConvention
                };
+
                foreach (ParameterDefinition pd in md.Parameters)
-                {
-                    session.ImportReference(pd.ParameterType);
-                    result.Parameters.Add(pd);
-                }
+                    result.Parameters.Add(pd.CloneImported(session, result));
+
                return result;
            }
-            else
-            {
-                return methodRef;
-            }
+
+            return methodRef;
        }

        /// <summary>
@@ -206,13 +194,13 @@ namespace FishNet.CodeGenerating.Extension

        public static MethodDefinition CreateCopy(this MethodDefinition copiedMd, CodegenSession session, string nameOverride = null, MethodAttributes? attributesOverride = null)
        {
-            session.ImportReference(copiedMd.ReturnType);
+            TypeReference returnType = session.ImportReference(copiedMd.ReturnType);

            MethodAttributes attr = attributesOverride.HasValue ? attributesOverride.Value : copiedMd.Attributes;
            string name = nameOverride == null ? copiedMd.Name : nameOverride;
-            MethodDefinition result = new(name, attr, copiedMd.ReturnType);
+            MethodDefinition result = new(name, attr, returnType);
            foreach (GenericParameter item in copiedMd.GenericParameters)
-                result.GenericParameters.Add(item);
+                result.GenericParameters.Add(new(item.Name, result) { Attributes = item.Attributes });

            result.CreateParameters(session, copiedMd);
            return result;
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Extension/MethodDefinitionExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -51,10 +51,7 @@ namespace FishNet.CodeGenerating.Extension
                    ExplicitThis = baseMd.ExplicitThis
                };
                foreach (ParameterDefinition pd in baseMd.Parameters)
-                {
-                    session.ImportReference(pd.ParameterType);
-                    baseMr.Parameters.Add(pd);
-                }
+                    baseMr.Parameters.Add(pd.CloneImported(session, baseMr));
            }
            else
            {
@@ -154,19 +151,15 @@ namespace FishNet.CodeGenerating.Extension
                };
                md.Body.InitLocals = methodTemplate.Body.InitLocals;

+                foreach (GenericParameter item in methodTemplate.GenericParameters)
+                {
+                    md.GenericParameters.Add(new(item.Name, md) { Attributes = item.Attributes });
+                }
+
                if (copyParameters)
                {
                    foreach (ParameterDefinition pd in methodTemplate.Parameters)
-                    {
-                        session.ImportReference(pd.ParameterType.CachedResolve(session));
-                        md.Parameters.Add(pd);
-                    }
-                }
-
-                foreach (GenericParameter item in methodTemplate.GenericParameters)
-                {
-                    session.ImportReference(item);
-                    md.GenericParameters.Add(item);
+                        md.Parameters.Add(pd.CloneImported(session, md));
                }

                td.Methods.Add(md);
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Extension/TypeDefinitionExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Extension/TypeReferenceExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -9,6 +9,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/FN_README.txt
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/AttributeHelper.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/CodegenSession.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/CreatedSyncVarGenerator.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -3,8 +3,67 @@ using System.Linq;

 namespace FishNet.CodeGenerating.Helping.Extension
 {
-    internal static class CustomAttributeExtensions
+   internal static class CustomAttributeExtensions
    {
+        private static IGenericParameterProvider GetSafeContext(CodegenSession session, IGenericParameterProvider context)
+        {
+            return (context != null && context.Module == session.Module) ? context : null;
+        }
+
+        /// <summary>
+        /// Clones an attribute into the current session module.
+        /// </summary>
+        internal static CustomAttribute CloneImported(this CustomAttribute customAttr, CodegenSession session, IGenericParameterProvider context = null)
+        {
+            IGenericParameterProvider safeContext = GetSafeContext(session, context);
+            MethodReference ctor = (safeContext == null) ? session.ImportReference(customAttr.Constructor) : session.ImportReference(customAttr.Constructor, safeContext);
+            CustomAttribute result = new(ctor);
+
+            foreach (CustomAttributeArgument item in customAttr.ConstructorArguments)
+                result.ConstructorArguments.Add(item.CloneImported(session, safeContext));
+
+            foreach (CustomAttributeNamedArgument item in customAttr.Fields)
+                result.Fields.Add(item.CloneImported(session, safeContext));
+
+            foreach (CustomAttributeNamedArgument item in customAttr.Properties)
+                result.Properties.Add(item.CloneImported(session, safeContext));
+
+            return result;
+        }
+
+        /// <summary>
+        /// Clones an attribute argument into the current session module.
+        /// </summary>
+        internal static CustomAttributeArgument CloneImported(this CustomAttributeArgument customAttrArg, CodegenSession session, IGenericParameterProvider context = null)
+        {
+            IGenericParameterProvider safeContext = GetSafeContext(session, context);
+            TypeReference typeRef = safeContext == null ? session.ImportReference(customAttrArg.Type) : session.ImportReference(customAttrArg.Type, safeContext);
+            object value = customAttrArg.Value;
+
+            if (value is TypeReference tr)
+            {
+                value = (safeContext == null) ? session.ImportReference(tr) : session.ImportReference(tr, safeContext);
+            }
+            else if (value is CustomAttributeArgument[] arguments)
+            {
+                CustomAttributeArgument[] clonedArguments = new CustomAttributeArgument[arguments.Length];
+                for (int i = 0; i < arguments.Length; i++)
+                    clonedArguments[i] = arguments[i].CloneImported(session, safeContext);
+
+                value = clonedArguments;
+            }
+
+            return new(typeRef, value);
+        }
+
+        /// <summary>
+        /// Clones a named attribute argument into the current session module.
+        /// </summary>
+        internal static CustomAttributeNamedArgument CloneImported(this CustomAttributeNamedArgument customAttrNamedArg, CodegenSession session, IGenericParameterProvider context = null)
+        {
+            return new(customAttrNamedArg.Name, customAttrNamedArg.Argument.CloneImported(session, context));
+        }
+        
        /// <summary>
        /// Finds a field within an attribute.
        /// </summary>
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Extension/CustomAttributeExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Extension/Diagnostics.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Extension/GetConstructor.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Extension/ILProcessorExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Extension/InstructionExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Extension/MethodReferenceExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Extension/ModuleDefinitionExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -5,6 +5,11 @@ namespace FishNet.CodeGenerating.Helping.Extension
 {
    internal static class ParameterDefinitionExtensions
    {
+        private static IGenericParameterProvider GetSafeContext(CodegenSession session, IGenericParameterProvider context)
+        {
+            return context != null && context.Module == session.Module ? context : null;
+        }
+
        /// <summary>
        /// Returns if parameterDef is Type.
        /// </summary>
@@ -15,5 +20,34 @@ namespace FishNet.CodeGenerating.Helping.Extension
        {
            return parameterDef.ParameterType.FullName == type.FullName;
        }
+
+        /// <summary>
+        /// Clones a parameter into the current session module.
+        /// </summary>
+        public static ParameterDefinition CloneImported(this ParameterDefinition parameterDef, CodegenSession session, IGenericParameterProvider context = null, string nameOverride = null)
+        {
+            IGenericParameterProvider safeContext = GetSafeContext(session, context);
+            TypeReference parameterTypeRef = safeContext == null ? session.ImportReference(parameterDef.ParameterType) : session.ImportReference(parameterDef.ParameterType, safeContext);
+            ParameterDefinition result = new(nameOverride ?? parameterDef.Name, parameterDef.Attributes, parameterTypeRef)
+            {
+                Constant = parameterDef.Constant,
+                IsReturnValue = parameterDef.IsReturnValue,
+                IsOut = parameterDef.IsOut,
+                IsIn = parameterDef.IsIn,
+                IsLcid = parameterDef.IsLcid,
+                IsOptional = parameterDef.IsOptional,
+                HasConstant = parameterDef.HasConstant,
+                HasDefault = parameterDef.HasDefault,
+                HasFieldMarshal = parameterDef.HasFieldMarshal
+            };
+
+            if (parameterDef.HasMarshalInfo)
+                result.MarshalInfo = parameterDef.MarshalInfo;
+
+            foreach (CustomAttribute item in parameterDef.CustomAttributes)
+                result.CustomAttributes.Add(item.CloneImported(session, safeContext));
+
+            return result;
+        }
    }
 }
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Extension/ParameterDefinitionExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Extension/TypeDefinitionExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Extension/TypeReferenceExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/GeneralHelper.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/NetworkBehaviourHelper.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/NetworkConnectionImports.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/ObjectHelper.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/PhysicsHelper.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/PredictedObjectHelper.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/ReaderImports.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/TimeManagerHelper.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/TransportHelper.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Typed/Comparers.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Typed/GeneratorHelper.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Typed/QOLAttributeType.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Typed/SerializatierType.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Typed/SyncIndexData.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Typed/SyncType.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/WriterImports.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/ILCore/FNPostProcessorAssemblyResolver.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/ILCore/FNPostProcessorReflectionImporter.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/ILCore/FNPostProcessorReflectionImporterProvider.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/ILCore/FishNetILPP.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/ILCore/ILCoreHelper.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Processing/CodegenBase.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Processing/CustomSerializerProcessor.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Processing/NetworkBehaviourProcessor.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Processing/Prediction/PredictionProcessor.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Processing/QOLAttributeProcessor.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Processing/ReaderProcessor.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Processing/Rpc/AttributeData.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Processing/Rpc/Attributes.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Processing/Rpc/CreatedRpc.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -349,7 +349,7 @@ namespace FishNet.CodeGenerating.Processing.Rpc
            ILProcessor processor = writerMd.Body.GetILProcessor();
            // Add all parameters from the original.
            for (int i = 0; i < originalMd.Parameters.Count; i++)
-                writerMd.Parameters.Add(originalMd.Parameters[i]);
+                writerMd.Parameters.Add(originalMd.Parameters[i].CloneImported(Session, writerMd));
            // Get channel if it exist, and get target parameter.
            ParameterDefinition channelParameterDef = GetChannelParameter(writerMd, RpcType.None);

@@ -413,7 +413,7 @@ namespace FishNet.CodeGenerating.Processing.Rpc

            // Add all parameters from the original.
            for (int i = 0; i < originalMd.Parameters.Count; i++)
-                writerMd.Parameters.Add(originalMd.Parameters[i]);
+                writerMd.Parameters.Add(originalMd.Parameters[i].CloneImported(Session, writerMd));
            // Add in channel if it doesnt exist.
            ParameterDefinition channelParameterDef = GetChannelParameter(writerMd, RpcType.Server);

@@ -880,7 +880,7 @@ namespace FishNet.CodeGenerating.Processing.Rpc
             * that some reason is the resolution, because Unity. However, even with this fix if the
             * developer makes use of the generic properties of the class from the offending method
             * there is a fair chance the application will crash. */
-#if !UNITY_2022_3_OR_NEWER
+            #if !UNITY_2022_3_OR_NEWER
            /* If the declaring type has a generic then we need to see if any
             * logic instructions call methods in another or same generic class. */
            ILProcessor processor = createdMd.Body.GetILProcessor();
@@ -894,7 +894,7 @@ namespace FishNet.CodeGenerating.Processing.Rpc

                Instruction v = instructions[i];
                OpCode instrOpCode = v.OpCode;
-                
+
                if (instrOpCode == OpCodes.Callvirt || instrOpCode == OpCodes.Call)
                {
                    MethodDefinition calledMd = null;
@@ -919,7 +919,7 @@ namespace FishNet.CodeGenerating.Processing.Rpc
                    }
                }
            }
-#endif
+            #endif

            return createdMd;
        }
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Processing/Rpc/RpcProcessor.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Processing/SyncTypeProcessor.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Processing/WriterProcessor.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -9,6 +9,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Unity.FishNet.CodeGen.asmdef
-  uploadId: 866910
+  uploadId: 892096
@@ -9,6 +9,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Directory.Build.props
-  uploadId: 866910
+  uploadId: 892096
@@ -9,6 +9,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/LICENSE.txt
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Cil/Code.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Cil/CodeReader.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Cil/CodeWriter.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Cil/Document.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Cil/ExceptionHandler.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Cil/ILProcessor.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Cil/Instruction.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Cil/MethodBody.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Cil/OpCode.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Cil/OpCodes.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Cil/PortablePdb.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Cil/SequencePoint.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Cil/Symbols.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Cil/VariableDefinition.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Cil/VariableReference.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Metadata/BlobHeap.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Metadata/Buffers.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Metadata/CodedIndex.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Metadata/ElementType.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Metadata/GuidHeap.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Metadata/Heap.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Metadata/MetadataToken.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Metadata/PdbHeap.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Metadata/Row.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Metadata/StringHeap.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Metadata/TableHeap.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Metadata/TokenType.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Metadata/UserStringHeap.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.Metadata/Utilities.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.PE/BinaryStreamReader.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.PE/BinaryStreamWriter.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.PE/ByteBuffer.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.PE/ByteBufferEqualityComparer.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.PE/DataDirectory.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.PE/Image.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.PE/ImageReader.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.PE/ImageWriter.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.PE/Section.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.PE/TextMap.cs
-  uploadId: 866910
+  uploadId: 892096
--- a/Show More
+++ b/Show More