Merge branch 'develop' into feature/NetworkTransform-using-Netvars

* develop:
  fix: gracefully handle exceptions in an RPC invoke (#846)
  fix: Fixing utp license file for legal (#843)
  ci: enable standards check on UTP too (#837)
  refactor: NetworkBehaviour.NetworkObject no longer throws an exception (#838)
  fix: revert #830 (#840)
  test: converting the manual rpc tests over to an automated unit test (#830)

Author: SamuelBellomo

com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs

@@ -300,9 +300,9 @@ public NetworkObject NetworkObject
                     m_NetworkObject = GetComponentInParent<NetworkObject>();
                 }
 
-                if (m_NetworkObject == null)
+                if (m_NetworkObject == null && NetworkLog.CurrentLogLevel <= LogLevel.Normal)
                 {
-                    throw new NullReferenceException($"Could not get {nameof(NetworkObject)} for the {nameof(NetworkBehaviour)}. Are you missing a {nameof(NetworkObject)} component?");
+                    NetworkLog.LogWarning($"Could not get {nameof(NetworkObject)} for the {nameof(NetworkBehaviour)}. Are you missing a {nameof(NetworkObject)} component?");
                 }
 
                 return m_NetworkObject;
@@ -312,18 +312,7 @@ public NetworkObject NetworkObject
         /// <summary>
         /// Gets whether or not this NetworkBehaviour instance has a NetworkObject owner.
         /// </summary>
-        public bool HasNetworkObject
-        {
-            get
-            {
-                if (m_NetworkObject == null)
-                {
-                    m_NetworkObject = GetComponentInParent<NetworkObject>();
-                }
-
-                return m_NetworkObject != null;
-            }
-        }
+        public bool HasNetworkObject => NetworkObject != null;
 
         private NetworkObject m_NetworkObject = null;
 

com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs

@@ -56,18 +56,18 @@ public class NetworkManager : MonoBehaviour, INetworkUpdateSystem, IProfilableTr
         internal NetworkTickSystem NetworkTickSystem { get; private set; }
 
         internal SnapshotSystem SnapshotSystem { get; private set; }
-        
+
         private NetworkPrefabHandler m_PrefabHandler;
         public NetworkPrefabHandler PrefabHandler
         {
             get
             {
-                if(m_PrefabHandler == null)
+                if (m_PrefabHandler == null)
                 {
                     m_PrefabHandler = new NetworkPrefabHandler();
                 }
                 return m_PrefabHandler;
-            }            
+            }
         }
 
         /// <summary>

com.unity.multiplayer.mlapi/Runtime/Messaging/RpcQueue/RpcQueueProcessor.cs

@@ -3,6 +3,8 @@
 using Unity.Profiling;
 using MLAPI.Configuration;
 using MLAPI.Profiling;
+using MLAPI.Logging;
+using UnityEngine;
 
 namespace MLAPI.Messaging
 {
@@ -60,7 +62,19 @@ public void ProcessReceiveQueue(NetworkUpdateStage currentStage, bool isTesting)
 
                         if (!isTesting)
                         {
-                            m_NetworkManager.InvokeRpc(currentQueueItem);
+                            try
+                            {
+                                m_NetworkManager.InvokeRpc(currentQueueItem);
+                            }
+                            catch (Exception ex)
+                            {
+                                Debug.LogException(ex);
+
+                                if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
+                                {
+                                    NetworkLog.LogWarning($"A {currentQueueItem.QueueItemType} threw an exception while executing! Please check Unity logs for more information.");
+                                }
+                            }
                         }
 
                         ProfilerStatManager.RpcsQueueProc.Record();

com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManager.cs

@@ -484,12 +484,12 @@ internal void ServerDestroySpawnedSceneObjects()
                     // within the NetworkSceneManager.SwitchScene method.
                     SpawnedObjectsList.Remove(sobj);
                     if (NetworkManager.PrefabHandler != null && NetworkManager.PrefabHandler.ContainsHandler(sobj))
-                    {                        
+                    {
                         NetworkManager.PrefabHandler.HandleNetworkPrefabDestroy(sobj);
                         OnDestroyObject(sobj.NetworkObjectId, false);
                     }
                     else
-                    {                        
+                    {
                         UnityEngine.Object.Destroy(sobj.gameObject);
                     }
                 }

com.unity.multiplayer.mlapi/Tests/Editor/NetworkBehaviourTests.cs

@@ -33,25 +33,15 @@ public void AccessNetworkObjectTest()
             var gameObject = new GameObject(nameof(AccessNetworkObjectTest));
             var networkBehaviour = gameObject.AddComponent<EmptyNetworkBehaviour>();
 
-            // TODO: Do we really want to throw here?
-            // Future API change: return null
-            Assert.Throws<NullReferenceException>(() =>
-            {
-                var x = networkBehaviour.NetworkObject;
-            });
+            Assert.That(networkBehaviour.NetworkObject, Is.Null);
 
             var networkObject = gameObject.AddComponent<NetworkObject>();
 
             Assert.That(networkBehaviour.NetworkObject, Is.EqualTo(networkObject));
 
             Object.DestroyImmediate(networkObject);
 
-            // TODO: Do we really want to throw here?
-            // Future API change: return null
-            Assert.Throws<NullReferenceException>(() =>
-            {
-                var x = networkBehaviour.NetworkObject;
-            });
+            Assert.That(networkBehaviour.NetworkObject, Is.Null);
 
             // Cleanup
             Object.DestroyImmediate(gameObject);

com.unity.multiplayer.mlapi/Tests/Runtime/ConnectionApproval.cs

@@ -19,7 +19,7 @@ public class ConnectionApprovalTests
         public void Setup()
         {
             // Create, instantiate, and host
-            Assert.IsTrue(NetworkManagerHelper.StartNetworkManager(out _,NetworkManagerHelper.NetworkManagerOperatingMode.None));
+            Assert.IsTrue(NetworkManagerHelper.StartNetworkManager(out _, NetworkManagerHelper.NetworkManagerOperatingMode.None));
             m_ValidationToken = Guid.NewGuid();
         }
 
@@ -35,24 +35,24 @@ public IEnumerator ConnectionApproval()
 
             var timeOut = Time.realtimeSinceStartup + 3.0f;
             var timedOut = false;
-            while(!m_IsValidated)
+            while (!m_IsValidated)
             {
                 yield return new WaitForSeconds(0.01f);
-                if(timeOut < Time.realtimeSinceStartup)
+                if (timeOut < Time.realtimeSinceStartup)
                 {
                     timedOut = true;
                 }
             }
 
             //Make sure we didn't time out
             Assert.False(timedOut);
-            Assert.True(m_IsValidated);            
+            Assert.True(m_IsValidated);
         }
 
         private void NetworkManagerObject_ConnectionApprovalCallback(byte[] connectionData, ulong clientId, NetworkManager.ConnectionApprovedDelegate callback)
         {
             var stringGuid = Encoding.UTF8.GetString(connectionData);
-            if(m_ValidationToken.ToString() == stringGuid)
+            if (m_ValidationToken.ToString() == stringGuid)
             {
                 m_IsValidated = true;
             }

com.unity.multiplayer.mlapi/Tests/Runtime/NetworkPrefabHandlerTests.cs

@@ -21,7 +21,7 @@ public class NetworkPrefabHandlerTests
         /// </summary>
         [Test]
         public void NetworkConfigInvalidNetworkPrefabTest()
-        {  
+        {
             var testPrefabObjectName = "NetworkPrefabHandlerTestObject";
             Guid baseObjectID = NetworkManagerHelper.AddGameNetworkObject(testPrefabObjectName);
             NetworkObject baseObject = NetworkManagerHelper.InstantiatedNetworkObjects[baseObjectID];
@@ -37,7 +37,7 @@ public void NetworkConfigInvalidNetworkPrefabTest()
 
             //Add a valid prefab
             NetworkManagerHelper.NetworkManagerObject.NetworkConfig.NetworkPrefabs.Add(validNetworkPrefab);
-            var exceptionOccurred = false; 
+            var exceptionOccurred = false;
             try
             {
                 NetworkManagerHelper.NetworkManagerObject.StartHost();
@@ -144,7 +144,7 @@ public void NetworkPrefabHandlerClass()
         public void Setup()
         {
             //Create, instantiate, and host
-            NetworkManagerHelper.StartNetworkManager(out _,NetworkManagerHelper.NetworkManagerOperatingMode.None);
+            NetworkManagerHelper.StartNetworkManager(out _, NetworkManagerHelper.NetworkManagerOperatingMode.None);
         }
 
         [TearDown]

com.unity.multiplayer.transport.utp/LICENSE.md

@@ -1,21 +1,9 @@
 MIT License
 
-Copyright (c) 2018, 2019 Albin Corén
+Copyright (c) 2021 Unity Technologies
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.