Fix ilpp to log message if NetworkManager is not connected or listening

Author: EmandM

com.unity.netcode.gameobjects/Editor/CodeGen/NetworkBehaviourILPP.cs

@@ -2229,6 +2229,7 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA
             {
                 var returnInstr = processor.Create(OpCodes.Ret);
                 var lastInstr = processor.Create(OpCodes.Nop);
+                var logNextInstr = processor.Create(OpCodes.Nop);
 
                 // networkManager = this.NetworkManager;
                 instructions.Add(processor.Create(OpCodes.Ldarg_0));
@@ -2237,28 +2238,16 @@ private void InjectWriteAndCallBlocks(MethodDefinition methodDefinition, CustomA
 
                 // if (networkManager == null || !networkManager.IsListening) { ... return };
                 instructions.Add(processor.Create(OpCodes.Ldloc, netManLocIdx));
-                instructions.Add(processor.Create(OpCodes.Brfalse, returnInstr));
+                instructions.Add(processor.Create(OpCodes.Brfalse_S, logNextInstr));
                 instructions.Add(processor.Create(OpCodes.Ldloc, netManLocIdx));
                 instructions.Add(processor.Create(OpCodes.Callvirt, m_NetworkManager_getIsListening_MethodRef));
-                instructions.Add(processor.Create(OpCodes.Brtrue, lastInstr));
-
-                var logNextInstr = processor.Create(OpCodes.Nop);
-
-                // if (LogLevel.Normal > networkManager.LogLevel)
-                instructions.Add(processor.Create(OpCodes.Ldloc, netManLocIdx));
-                instructions.Add(processor.Create(OpCodes.Ldfld, m_NetworkManager_LogLevel_FieldRef));
-                instructions.Add(processor.Create(OpCodes.Ldc_I4, (int)LogLevel.Normal));
-                instructions.Add(processor.Create(OpCodes.Cgt));
-                instructions.Add(processor.Create(OpCodes.Ldc_I4, 0));
-                instructions.Add(processor.Create(OpCodes.Ceq));
-                instructions.Add(processor.Create(OpCodes.Brfalse, logNextInstr));
+                instructions.Add(processor.Create(OpCodes.Brtrue_S, lastInstr));
 
                 // Debug.LogError(...);
+                instructions.Add(logNextInstr);
                 instructions.Add(processor.Create(OpCodes.Ldstr, "Rpc methods can only be invoked after starting the NetworkManager!"));
                 instructions.Add(processor.Create(OpCodes.Call, m_Debug_LogError_MethodRef));
 
-                instructions.Add(logNextInstr);
-
                 instructions.Add(returnInstr);
                 instructions.Add(lastInstr);
             }

com.unity.netcode.gameobjects/Tests/Editor/NetworkBehaviourEditorTests.cs

@@ -1,5 +1,7 @@
+using System.Collections;
 using NUnit.Framework;
 using UnityEngine;
+using UnityEngine.TestTools;
 using Object = UnityEngine.Object;
 
 namespace Unity.Netcode.EditorTests
@@ -35,8 +37,6 @@ public void AccessNetworkObjectTest()
             var gameObject = new GameObject(nameof(AccessNetworkObjectTest));
             var networkBehaviour = gameObject.AddComponent<EmptyNetworkBehaviour>();
 
-            networkBehaviour.NoNetworkRpc();
-
             Assert.That(networkBehaviour.NetworkObject, Is.Null);
 
             var networkObject = gameObject.AddComponent<NetworkObject>();
@@ -71,6 +71,34 @@ public void AccessNetworkObjectTestInDerivedClassWithOverrideFunctions()
             Object.DestroyImmediate(gameObject);
         }
 
+        [UnityTest]
+        public IEnumerator RpcShouldNoopWhenInvokedWithoutANetworkManagerSession()
+        {
+            var noNetworkError = "Rpc methods can only be invoked after starting the NetworkManager!";
+            var gameObject = new GameObject(nameof(AccessNetworkObjectTestInDerivedClassWithOverrideFunctions));
+            var networkBehaviour = gameObject.AddComponent<RpcNetworkBehaviour>();
+
+            // No networkManager exists so error should be logged
+            LogAssert.Expect(LogType.Error, noNetworkError);
+            networkBehaviour.NoNetworkRpc();
+
+            // Ensure RPC was not invoked locally
+            yield return null;
+            Assert.That(networkBehaviour.RpcWasInvoked, Is.False);
+
+            var networkManager = gameObject.AddComponent<NetworkManager>();
+            networkManager.SetSingleton();
+
+            LogAssert.Expect(LogType.Error, noNetworkError);
+            networkBehaviour.NoNetworkRpc();
+
+            // Ensure RPC was not invoked locally
+            yield return null;
+            Assert.That(networkBehaviour.RpcWasInvoked, Is.False);
+
+            Object.DestroyImmediate(gameObject);
+        }
+
         // Note: in order to repro https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/issues/1078
         // this child class must be defined before its parent to assure it is processed first by ILPP
         internal class DerivedNetworkBehaviour : EmptyNetworkBehaviour
@@ -79,10 +107,16 @@ internal class DerivedNetworkBehaviour : EmptyNetworkBehaviour
 
         internal class EmptyNetworkBehaviour : NetworkBehaviour
         {
+        }
+
+        internal class RpcNetworkBehaviour : NetworkBehaviour
+        {
+            public bool RpcWasInvoked;
+
             [Rpc(SendTo.Everyone)]
             public void NoNetworkRpc()
             {
-                Debug.Log("No Network Rpc");
+                RpcWasInvoked = true;
             }
         }
     }