4.6.16R

- Fixed Server/ClientAttribute not blocking execution when IsNetworked was set to false (#939).
- Improved added a variety of ProfilerMarkers (#976).
- Improved NetworkManager.RunInBackground now only applies when the network is active (#954).
- Fixed specified prefab folders incorrectly checking for overlapping recrusion (#986).
- Fixed DefaultPrefabObjects inconsistent asset paths related to culture specific strings (#982).
- Fixed Collection/Object caches mishandling multithreading; introduced in Unity 6+ (#984).
- Fixed NetworkObjects initializing excessively at runtime during instantiate and scene loads.
- Fixed SyncType values not resetting on client when using pooled objects.
- Fixed despawned nested NetworkObjects serializing incorrectly (#950).
- Fixed pooled objects sometimes having the incorrect position upon spawning after the first time. (#949).
- Fixed rollback time calculation for client-only when user-logic incorrectly identified as host.
- Fixed StatisticsManager and BandwidthDisplay reporting incorrectly.
- Changed local transports no longer automatically authenticate when an authenticator is present; authenticators should now handle local transports/connections. See HostAuthenticator and PasswordAuthenticator example.
- Improved renamed several files related to code generation to prevent conflicts with NGO.
- Improved PasswordAuthenticator example and comments.
- Improved HostAuthenticator comments and usage.
- Added QuaternionAutoPack to allow easy Quaterion packing levels for types, such as reconcile rotation data.
- Added MovePosition/MoveRotation to PredictionRigidbody/2D.
- Added rotationPacking option to PredictionRigidbody/2D.

Author: FirstGearGames

Assets/FishNet/CodeGenerating/Helpers/NetworkBehaviourHelper.cs

@@ -331,12 +331,13 @@ internal void CreateIsClientCheck(MethodDefinition methodDef, LoggingType loggin
              * Should the if check pass then code
              * jumps to this instruction. */
             ILProcessor processor = methodDef.Body.GetILProcessor();
-            Instruction endIf = processor.Create(OpCodes.Nop);
+            Instruction conditionFailedInst = processor.Create(OpCodes.Nop);
+            Instruction conditionPassedInst = processor.Create(OpCodes.Nop);
 
             List<Instruction> instructions = new();
 
             if (checkIsNetworked)
-                instructions.AddRange(CreateIsNetworkedCheck(methodDef, endIf));
+                instructions.AddRange(CreateIsNetworkedCheck(methodDef, OpCodes.Brtrue, conditionPassedInst));
 
             // Checking against the NetworkObject.
             if (!useStatic)
@@ -350,7 +351,10 @@ internal void CreateIsClientCheck(MethodDefinition methodDef, LoggingType loggin
             {
                 instructions.Add(processor.Create(OpCodes.Call, GetClass<ObjectHelper>().InstanceFinder_IsClient_MethodRef));
             }
-            instructions.Add(processor.Create(OpCodes.Brtrue, endIf));
+            
+            instructions.Add(processor.Create(OpCodes.Brtrue, conditionPassedInst));
+            instructions.Add(conditionFailedInst);
+            
             // If warning then also append warning text.
             if (loggingType != LoggingType.Off)
             {
@@ -360,7 +364,7 @@ internal void CreateIsClientCheck(MethodDefinition methodDef, LoggingType loggin
             // Add return.
             instructions.AddRange(CreateRetDefault(methodDef));
             // After if statement, jumped to when successful check.
-            instructions.Add(endIf);
+            instructions.Add(conditionPassedInst);
 
             if (insertFirst)
             {
@@ -383,12 +387,13 @@ internal void CreateIsServerCheck(MethodDefinition methodDef, LoggingType loggin
              * Should the if check pass then code
              * jumps to this instruction. */
             ILProcessor processor = methodDef.Body.GetILProcessor();
-            Instruction endIf = processor.Create(OpCodes.Nop);
+            Instruction conditionFailedInst = processor.Create(OpCodes.Nop);
+            Instruction conditionPassedInst = processor.Create(OpCodes.Nop);
 
             List<Instruction> instructions = new();
 
             if (checkIsNetworked)
-                instructions.AddRange(CreateIsNetworkedCheck(methodDef, endIf));
+                instructions.AddRange(CreateIsNetworkedCheck(methodDef, OpCodes.Brfalse, conditionFailedInst));
 
             if (!useStatic)
             {
@@ -401,7 +406,10 @@ internal void CreateIsServerCheck(MethodDefinition methodDef, LoggingType loggin
             {
                 instructions.Add(processor.Create(OpCodes.Call, GetClass<ObjectHelper>().InstanceFinder_IsServer_MethodRef));
             }
-            instructions.Add(processor.Create(OpCodes.Brtrue, endIf));
+
+            instructions.Add(processor.Create(OpCodes.Brtrue, conditionPassedInst));
+            instructions.Add(conditionFailedInst);
+
             // If warning then also append warning text.
             if (loggingType != LoggingType.Off)
             {
@@ -411,7 +419,7 @@ internal void CreateIsServerCheck(MethodDefinition methodDef, LoggingType loggin
             // Add return.
             instructions.AddRange(CreateRetDefault(methodDef));
             // After if statement, jumped to when successful check.
-            instructions.Add(endIf);
+            instructions.Add(conditionPassedInst);
 
             if (insertFirst)
             {
@@ -427,13 +435,19 @@ internal void CreateIsServerCheck(MethodDefinition methodDef, LoggingType loggin
         /// <summary>
         /// Creates a call to base.IsNetworked and returns instructions.
         /// </summary>
-        private List<Instruction> CreateIsNetworkedCheck(MethodDefinition methodDef, Instruction endIfInst)
+        private List<Instruction> CreateIsNetworkedCheck(MethodDefinition methodDef, OpCode conditionalOpCode, Instruction endIfInst)
         {
+            if (conditionalOpCode != OpCodes.Brfalse && conditionalOpCode != OpCodes.Brtrue && conditionalOpCode != OpCodes.Brfalse_S && conditionalOpCode != OpCodes.Brtrue_S)
+            {
+                Session.LogError($"OpCode {conditionalOpCode} is not supported for method {nameof(CreateIsNetworkedCheck)}.");
+                return new();
+            }
+
             List<Instruction> insts = new();
             ILProcessor processor = methodDef.Body.GetILProcessor();
             insts.Add(processor.Create(OpCodes.Ldarg_0));
             insts.Add(processor.Create(OpCodes.Call, GetClass<NetworkBehaviourHelper>().IsNetworked_MethodRef));
-            insts.Add(processor.Create(OpCodes.Brfalse, endIfInst));
+            insts.Add(processor.Create(conditionalOpCode, endIfInst));
 
             return insts;
         }