perf: performance improvements MTT-4641 #2176 (#2204)

jeffreyrainy · smitdylan2001 · web-flow · commit c5dff6d3fdbb · 2022-09-23T13:23:31.000Z
* Performance Improvement

- Merge if else into return
- Merge .rotation and .position into .SetPositionAndRotation
- Remove .ToString() call on strings
- Use TryGetComponent to reduce garbage allocation
- Merge .Where().Count() calls into .Count() call
- Remove indirect gameObject call 
- Remove redundant null check
- Use native .Count instead of LINQ method
- Use faster string comparison

* style: adjusting to code standards

Co-authored-by: smitdylan2001 &lt;dylan.smit01@gmail.com&gt;
diff --git a/com.unity.netcode.gameobjects/Components/NetworkTransform.cs b/com.unity.netcode.gameobjects/Components/NetworkTransform.cs
@@ -282,14 +282,7 @@ public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReade
                 {
                     // Go ahead and mark the local state dirty or not dirty as well
                     /// <see cref="TryCommitTransformToServer"/>
-                    if (HasPositionChange || HasRotAngleChange || HasScaleChange)
-                    {
-                        IsDirty = true;
-                    }
-                    else
-                    {
-                        IsDirty = false;
-                    }
+                    IsDirty = HasPositionChange || HasRotAngleChange || HasScaleChange;
                 }
             }
         }
@@ -1150,8 +1143,7 @@ private void SetStateInternal(Vector3 pos, Quaternion rot, Vector3 scale, bool s
             }
             else
             {
-                transform.position = pos;
-                transform.rotation = rot;
+                transform.SetPositionAndRotation(pos, rot);
             }
             transform.localScale = scale;
             m_LocalAuthoritativeNetworkState.IsTeleportingNextFrame = shouldTeleport;
diff --git a/com.unity.netcode.gameobjects/Editor/CodeGen/INetworkMessageILPP.cs b/com.unity.netcode.gameobjects/Editor/CodeGen/INetworkMessageILPP.cs
@@ -73,7 +73,7 @@ public override ILPostProcessResult Process(ICompiledAssembly compiledAssembly)
                     }
                     catch (Exception e)
                     {
-                        m_Diagnostics.AddError((e.ToString() + e.StackTrace.ToString()).Replace("\n", "|").Replace("\r", "|"));
+                        m_Diagnostics.AddError((e.ToString() + e.StackTrace).Replace("\n", "|").Replace("\r", "|"));
                     }
                 }
                 else
diff --git a/com.unity.netcode.gameobjects/Editor/CodeGen/INetworkSerializableILPP.cs b/com.unity.netcode.gameobjects/Editor/CodeGen/INetworkSerializableILPP.cs
@@ -91,7 +91,7 @@ public override ILPostProcessResult Process(ICompiledAssembly compiledAssembly)
                 }
                 catch (Exception e)
                 {
-                    m_Diagnostics.AddError((e.ToString() + e.StackTrace.ToString()).Replace("\n", "|").Replace("\r", "|"));
+                    m_Diagnostics.AddError((e.ToString() + e.StackTrace).Replace("\n", "|").Replace("\r", "|"));
                 }
             }
             else
diff --git a/com.unity.netcode.gameobjects/Editor/CodeGen/NetworkBehaviourILPP.cs b/com.unity.netcode.gameobjects/Editor/CodeGen/NetworkBehaviourILPP.cs
@@ -76,7 +76,7 @@ public override ILPostProcessResult Process(ICompiledAssembly compiledAssembly)
                     }
                     catch (Exception e)
                     {
-                        m_Diagnostics.AddError((e.ToString() + e.StackTrace.ToString()).Replace("\n", "|").Replace("\r", "|"));
+                        m_Diagnostics.AddError((e.ToString() + e.StackTrace).Replace("\n", "|").Replace("\r", "|"));
                     }
                 }
                 else
diff --git a/com.unity.netcode.gameobjects/Editor/NetworkBehaviourEditor.cs b/com.unity.netcode.gameobjects/Editor/NetworkBehaviourEditor.cs
@@ -263,8 +263,7 @@ public static void CheckForNetworkObject(GameObject gameObject, bool networkObje
 
             // Now get the root parent transform to the current GameObject (or itself)
             var rootTransform = GetRootParentTransform(gameObject.transform);
-            var networkManager = rootTransform.GetComponent<NetworkManager>();
-            if (networkManager == null)
+            if (!rootTransform.TryGetComponent<NetworkManager>(out var networkManager))
             {
                 networkManager = rootTransform.GetComponentInChildren<NetworkManager>();
             }
@@ -299,8 +298,7 @@ public static void CheckForNetworkObject(GameObject gameObject, bool networkObje
 
             // Otherwise, check to see if there is any NetworkObject from the root GameObject down to all children.
             // If not, notify the user that NetworkBehaviours require that the relative GameObject has a NetworkObject component.
-            var networkObject = rootTransform.GetComponent<NetworkObject>();
-            if (networkObject == null)
+            if (!rootTransform.TryGetComponent<NetworkObject>(out var networkObject))
             {
                 networkObject = rootTransform.GetComponentInChildren<NetworkObject>();
 
diff --git a/com.unity.netcode.gameobjects/Editor/NetworkManagerHelper.cs b/com.unity.netcode.gameobjects/Editor/NetworkManagerHelper.cs
@@ -64,7 +64,7 @@ private static void ScenesInBuildActiveSceneCheck()
         {
             var scenesList = EditorBuildSettings.scenes.ToList();
             var activeScene = SceneManager.GetActiveScene();
-            var isSceneInBuildSettings = scenesList.Where((c) => c.path == activeScene.path).Count() == 1;
+            var isSceneInBuildSettings = scenesList.Count((c) => c.path == activeScene.path) == 1;
             var networkManager = Object.FindObjectOfType<NetworkManager>();
             if (!isSceneInBuildSettings && networkManager != null)
             {
@@ -109,9 +109,8 @@ private static void EditorApplication_hierarchyChanged()
         public void CheckAndNotifyUserNetworkObjectRemoved(NetworkManager networkManager, bool editorTest = false)
         {
             // Check for any NetworkObject at the same gameObject relative layer
-            var networkObject = networkManager.gameObject.GetComponent<NetworkObject>();
 
-            if (networkObject == null)
+            if (!networkManager.gameObject.TryGetComponent<NetworkObject>(out var networkObject))
             {
                 // if none is found, check to see if any children have a NetworkObject
                 networkObject = networkManager.gameObject.GetComponentInChildren<NetworkObject>();
diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs
@@ -51,7 +51,7 @@ public class NetworkManager : MonoBehaviour, INetworkUpdateSystem
 
         internal static string PrefabDebugHelper(NetworkPrefab networkPrefab)
         {
-            return $"{nameof(NetworkPrefab)} \"{networkPrefab.Prefab.gameObject.name}\"";
+            return $"{nameof(NetworkPrefab)} \"{networkPrefab.Prefab.name}\"";
         }
 
         internal NetworkBehaviourUpdater BehaviourUpdater { get; set; }
@@ -187,8 +187,7 @@ public void Send(ulong clientId, NetworkDelivery delivery, FastBufferWriter batc
         /// <returns>a <see cref="GameObject"/> that is either the override or if no overrides exist it returns the same as the one passed in as a parameter</returns>
         public GameObject GetNetworkPrefabOverride(GameObject gameObject)
         {
-            var networkObject = gameObject.GetComponent<NetworkObject>();
-            if (networkObject != null)
+            if (gameObject.TryGetComponent<NetworkObject>(out var networkObject))
             {
                 if (NetworkConfig.NetworkPrefabOverrideLinks.ContainsKey(networkObject.GlobalObjectIdHash))
                 {
@@ -519,8 +518,7 @@ internal void OnValidate()
                 var networkPrefabGo = networkPrefab?.Prefab;
                 if (networkPrefabGo != null)
                 {
-                    var networkObject = networkPrefabGo.GetComponent<NetworkObject>();
-                    if (networkObject == null)
+                    if (!networkPrefabGo.TryGetComponent<NetworkObject>(out var networkObject))
                     {
                         if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
                         {
@@ -695,8 +693,7 @@ private bool ShouldAddPrefab(NetworkPrefab networkPrefab, out uint sourcePrefabG
             }
             else if (networkPrefab.Override == NetworkPrefabOverride.None)
             {
-                networkObject = networkPrefab.Prefab.GetComponent<NetworkObject>();
-                if (networkObject == null)
+                if (!networkPrefab.Prefab.TryGetComponent(out networkObject))
                 {
                     if (NetworkLog.CurrentLogLevel <= LogLevel.Error)
                     {
@@ -742,8 +739,7 @@ private bool ShouldAddPrefab(NetworkPrefab networkPrefab, out uint sourcePrefabG
                             }
                             else
                             {
-                                networkObject = networkPrefab.SourcePrefabToOverride.GetComponent<NetworkObject>();
-                                if (networkObject == null)
+                                if (!networkPrefab.SourcePrefabToOverride.TryGetComponent(out networkObject))
                                 {
                                     if (NetworkLog.CurrentLogLevel <= LogLevel.Error)
                                     {
@@ -968,8 +964,7 @@ private void Initialize(bool server)
             // If we have a player prefab, then we need to verify it is in the list of NetworkPrefabOverrideLinks for client side spawning.
             if (NetworkConfig.PlayerPrefab != null)
             {
-                var playerPrefabNetworkObject = NetworkConfig.PlayerPrefab.GetComponent<NetworkObject>();
-                if (playerPrefabNetworkObject != null)
+                if (NetworkConfig.PlayerPrefab.TryGetComponent<NetworkObject>(out var playerPrefabNetworkObject))
                 {
                     //In the event there is no NetworkPrefab entry (i.e. no override for default player prefab)
                     if (!NetworkConfig.NetworkPrefabOverrideLinks.ContainsKey(playerPrefabNetworkObject
diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs
@@ -435,7 +435,7 @@ public static void NetworkHide(List<NetworkObject> networkObjects, ulong clientI
         private void OnDestroy()
         {
             if (NetworkManager != null && NetworkManager.IsListening && NetworkManager.IsServer == false && IsSpawned &&
-                (IsSceneObject == null || (IsSceneObject != null && IsSceneObject.Value != true)))
+                (IsSceneObject == null || (IsSceneObject.Value != true)))
             {
                 throw new NotServerException($"Destroy a spawned {nameof(NetworkObject)} on a non-host client is not valid. Call {nameof(Destroy)} or {nameof(Despawn)} on the server/host instead.");
             }
@@ -690,8 +690,7 @@ private void OnTransformParentChanged()
             var parentTransform = transform.parent;
             if (parentTransform != null)
             {
-                var parentObject = transform.parent.GetComponent<NetworkObject>();
-                if (parentObject == null)
+                if (!transform.parent.TryGetComponent<NetworkObject>(out var parentObject))
                 {
                     transform.parent = m_CachedParent;
                     Debug.LogException(new InvalidParentException($"Invalid parenting, {nameof(NetworkObject)} moved under a non-{nameof(NetworkObject)} parent"));
diff --git a/com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventData.cs b/com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventData.cs
@@ -398,9 +398,9 @@ internal void WriteSceneSynchronizationData(FastBufferWriter writer)
             int totalBytes = 0;
 
             // Write the number of NetworkObjects we are serializing
-            BytePacker.WriteValuePacked(writer, m_NetworkObjectsSync.Count());
+            BytePacker.WriteValuePacked(writer, m_NetworkObjectsSync.Count);
             // Serialize all NetworkObjects that are spawned
-            for (var i = 0; i < m_NetworkObjectsSync.Count(); ++i)
+            for (var i = 0; i < m_NetworkObjectsSync.Count; ++i)
             {
                 var noStart = writer.Position;
                 var sceneObject = m_NetworkObjectsSync[i].GetMessageSceneObject(TargetClientId);
@@ -411,9 +411,9 @@ internal void WriteSceneSynchronizationData(FastBufferWriter writer)
             }
 
             // Write the number of despawned in-scene placed NetworkObjects
-            writer.WriteValueSafe(m_DespawnedInSceneObjectsSync.Count());
+            writer.WriteValueSafe(m_DespawnedInSceneObjectsSync.Count);
             // Write the scene handle and GlobalObjectIdHash value
-            for (var i = 0; i < m_DespawnedInSceneObjectsSync.Count(); ++i)
+            for (var i = 0; i < m_DespawnedInSceneObjectsSync.Count; ++i)
             {
                 var noStart = writer.Position;
                 var sceneObject = m_DespawnedInSceneObjectsSync[i].GetMessageSceneObject(TargetClientId);
diff --git a/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs b/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs
@@ -119,8 +119,7 @@ public void RegisterHostGlobalObjectIdHashValues(GameObject sourceNetworkPrefab,
                         // Now we register all
                         foreach (var gameObject in networkPrefabOverrides)
                         {
-                            var targetNetworkObject = gameObject.GetComponent<NetworkObject>();
-                            if (targetNetworkObject != null)
+                            if (gameObject.TryGetComponent<NetworkObject>(out var targetNetworkObject))
                             {
                                 if (!m_PrefabInstanceToPrefabAsset.ContainsKey(targetNetworkObject.GlobalObjectIdHash))
                                 {
diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs
@@ -306,7 +306,7 @@ private static NetworkEndpoint ParseNetworkEndpoint(string ip, ushort port)
             /// <summary>
             /// Endpoint (IP address and port) server will listen/bind on.
             /// </summary>
-            public NetworkEndpoint ListenEndPoint => ParseNetworkEndpoint((ServerListenAddress == string.Empty) ? Address : ServerListenAddress, Port);
+            public NetworkEndpoint ListenEndPoint => ParseNetworkEndpoint((ServerListenAddress?.Length == 0) ? Address : ServerListenAddress, Port);
         }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -282,14 +282,7 @@ public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReade`
`282`	`282`	`{`
`283`	`283`	`// Go ahead and mark the local state dirty or not dirty as well`
`284`	`284`	`/// <see cref="TryCommitTransformToServer"/>`
`285`		`- if (HasPositionChange \|\| HasRotAngleChange \|\| HasScaleChange)`
`286`		`- {`
`287`		`- IsDirty = true;`
`288`		`- }`
`289`		`- else`
`290`		`- {`
`291`		`- IsDirty = false;`
`292`		`- }`
	`285`	`+ IsDirty = HasPositionChange \|\| HasRotAngleChange \|\| HasScaleChange;`
`293`	`286`	`}`
`294`	`287`	`}`
`295`	`288`	`}`
`@@ -1150,8 +1143,7 @@ private void SetStateInternal(Vector3 pos, Quaternion rot, Vector3 scale, bool s`
`1150`	`1143`	`}`
`1151`	`1144`	`else`
`1152`	`1145`	`{`
`1153`		`- transform.position = pos;`
`1154`		`- transform.rotation = rot;`
	`1146`	`+ transform.SetPositionAndRotation(pos, rot);`
`1155`	`1147`	`}`
`1156`	`1148`	`transform.localScale = scale;`
`1157`	`1149`	`m_LocalAuthoritativeNetworkState.IsTeleportingNextFrame = shouldTeleport;`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public override ILPostProcessResult Process(ICompiledAssembly compiledAssembly)`
`73`	`73`	`}`
`74`	`74`	`catch (Exception e)`
`75`	`75`	`{`
`76`		`- m_Diagnostics.AddError((e.ToString() + e.StackTrace.ToString()).Replace("\n", "\|").Replace("\r", "\|"));`
	`76`	`+ m_Diagnostics.AddError((e.ToString() + e.StackTrace).Replace("\n", "\|").Replace("\r", "\|"));`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`else`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public override ILPostProcessResult Process(ICompiledAssembly compiledAssembly)`
`91`	`91`	`}`
`92`	`92`	`catch (Exception e)`
`93`	`93`	`{`
`94`		`- m_Diagnostics.AddError((e.ToString() + e.StackTrace.ToString()).Replace("\n", "\|").Replace("\r", "\|"));`
	`94`	`+ m_Diagnostics.AddError((e.ToString() + e.StackTrace).Replace("\n", "\|").Replace("\r", "\|"));`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`	`else`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public override ILPostProcessResult Process(ICompiledAssembly compiledAssembly)`
`76`	`76`	`}`
`77`	`77`	`catch (Exception e)`
`78`	`78`	`{`
`79`		`- m_Diagnostics.AddError((e.ToString() + e.StackTrace.ToString()).Replace("\n", "\|").Replace("\r", "\|"));`
	`79`	`+ m_Diagnostics.AddError((e.ToString() + e.StackTrace).Replace("\n", "\|").Replace("\r", "\|"));`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`	`else`
Original file line number	Diff line number	Diff line change
`@@ -263,8 +263,7 @@ public static void CheckForNetworkObject(GameObject gameObject, bool networkObje`
`263`	`263`
`264`	`264`	`// Now get the root parent transform to the current GameObject (or itself)`
`265`	`265`	`var rootTransform = GetRootParentTransform(gameObject.transform);`
`266`		`- var networkManager = rootTransform.GetComponent<NetworkManager>();`
`267`		`- if (networkManager == null)`
	`266`	`+ if (!rootTransform.TryGetComponent<NetworkManager>(out var networkManager))`
`268`	`267`	`{`
`269`	`268`	`networkManager = rootTransform.GetComponentInChildren<NetworkManager>();`
`270`	`269`	`}`
`@@ -299,8 +298,7 @@ public static void CheckForNetworkObject(GameObject gameObject, bool networkObje`
`299`	`298`
`300`	`299`	`// Otherwise, check to see if there is any NetworkObject from the root GameObject down to all children.`
`301`	`300`	`// If not, notify the user that NetworkBehaviours require that the relative GameObject has a NetworkObject component.`
`302`		`- var networkObject = rootTransform.GetComponent<NetworkObject>();`
`303`		`- if (networkObject == null)`
	`301`	`+ if (!rootTransform.TryGetComponent<NetworkObject>(out var networkObject))`
`304`	`302`	`{`
`305`	`303`	`networkObject = rootTransform.GetComponentInChildren<NetworkObject>();`
`306`	`304`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ private static void ScenesInBuildActiveSceneCheck()`
`64`	`64`	`{`
`65`	`65`	`var scenesList = EditorBuildSettings.scenes.ToList();`
`66`	`66`	`var activeScene = SceneManager.GetActiveScene();`
`67`		`- var isSceneInBuildSettings = scenesList.Where((c) => c.path == activeScene.path).Count() == 1;`
	`67`	`+ var isSceneInBuildSettings = scenesList.Count((c) => c.path == activeScene.path) == 1;`
`68`	`68`	`var networkManager = Object.FindObjectOfType<NetworkManager>();`
`69`	`69`	`if (!isSceneInBuildSettings && networkManager != null)`
`70`	`70`	`{`
`@@ -109,9 +109,8 @@ private static void EditorApplication_hierarchyChanged()`
`109`	`109`	`public void CheckAndNotifyUserNetworkObjectRemoved(NetworkManager networkManager, bool editorTest = false)`
`110`	`110`	`{`
`111`	`111`	`// Check for any NetworkObject at the same gameObject relative layer`
`112`		`- var networkObject = networkManager.gameObject.GetComponent<NetworkObject>();`
`113`	`112`
`114`		`- if (networkObject == null)`
	`113`	`+ if (!networkManager.gameObject.TryGetComponent<NetworkObject>(out var networkObject))`
`115`	`114`	`{`
`116`	`115`	`// if none is found, check to see if any children have a NetworkObject`
`117`	`116`	`networkObject = networkManager.gameObject.GetComponentInChildren<NetworkObject>();`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public class NetworkManager : MonoBehaviour, INetworkUpdateSystem`
`51`	`51`
`52`	`52`	`internal static string PrefabDebugHelper(NetworkPrefab networkPrefab)`
`53`	`53`	`{`
`54`		`- return $"{nameof(NetworkPrefab)} \"{networkPrefab.Prefab.gameObject.name}\"";`
	`54`	`+ return $"{nameof(NetworkPrefab)} \"{networkPrefab.Prefab.name}\"";`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`internal NetworkBehaviourUpdater BehaviourUpdater { get; set; }`
`@@ -187,8 +187,7 @@ public void Send(ulong clientId, NetworkDelivery delivery, FastBufferWriter batc`
`187`	`187`	`/// <returns>a <see cref="GameObject"/> that is either the override or if no overrides exist it returns the same as the one passed in as a parameter</returns>`
`188`	`188`	`public GameObject GetNetworkPrefabOverride(GameObject gameObject)`
`189`	`189`	`{`
`190`		`- var networkObject = gameObject.GetComponent<NetworkObject>();`
`191`		`- if (networkObject != null)`
	`190`	`+ if (gameObject.TryGetComponent<NetworkObject>(out var networkObject))`
`192`	`191`	`{`
`193`	`192`	`if (NetworkConfig.NetworkPrefabOverrideLinks.ContainsKey(networkObject.GlobalObjectIdHash))`
`194`	`193`	`{`
`@@ -519,8 +518,7 @@ internal void OnValidate()`
`519`	`518`	`var networkPrefabGo = networkPrefab?.Prefab;`
`520`	`519`	`if (networkPrefabGo != null)`
`521`	`520`	`{`
`522`		`- var networkObject = networkPrefabGo.GetComponent<NetworkObject>();`
`523`		`- if (networkObject == null)`
	`521`	`+ if (!networkPrefabGo.TryGetComponent<NetworkObject>(out var networkObject))`
`524`	`522`	`{`
`525`	`523`	`if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)`
`526`	`524`	`{`
`@@ -695,8 +693,7 @@ private bool ShouldAddPrefab(NetworkPrefab networkPrefab, out uint sourcePrefabG`
`695`	`693`	`}`
`696`	`694`	`else if (networkPrefab.Override == NetworkPrefabOverride.None)`
`697`	`695`	`{`
`698`		`- networkObject = networkPrefab.Prefab.GetComponent<NetworkObject>();`
`699`		`- if (networkObject == null)`
	`696`	`+ if (!networkPrefab.Prefab.TryGetComponent(out networkObject))`
`700`	`697`	`{`
`701`	`698`	`if (NetworkLog.CurrentLogLevel <= LogLevel.Error)`
`702`	`699`	`{`
`@@ -742,8 +739,7 @@ private bool ShouldAddPrefab(NetworkPrefab networkPrefab, out uint sourcePrefabG`
`742`	`739`	`}`
`743`	`740`	`else`
`744`	`741`	`{`
`745`		`- networkObject = networkPrefab.SourcePrefabToOverride.GetComponent<NetworkObject>();`
`746`		`- if (networkObject == null)`
	`742`	`+ if (!networkPrefab.SourcePrefabToOverride.TryGetComponent(out networkObject))`
`747`	`743`	`{`
`748`	`744`	`if (NetworkLog.CurrentLogLevel <= LogLevel.Error)`
`749`	`745`	`{`
`@@ -968,8 +964,7 @@ private void Initialize(bool server)`
`968`	`964`	`// If we have a player prefab, then we need to verify it is in the list of NetworkPrefabOverrideLinks for client side spawning.`
`969`	`965`	`if (NetworkConfig.PlayerPrefab != null)`
`970`	`966`	`{`
`971`		`- var playerPrefabNetworkObject = NetworkConfig.PlayerPrefab.GetComponent<NetworkObject>();`
`972`		`- if (playerPrefabNetworkObject != null)`
	`967`	`+ if (NetworkConfig.PlayerPrefab.TryGetComponent<NetworkObject>(out var playerPrefabNetworkObject))`
`973`	`968`	`{`
`974`	`969`	`//In the event there is no NetworkPrefab entry (i.e. no override for default player prefab)`
`975`	`970`	`if (!NetworkConfig.NetworkPrefabOverrideLinks.ContainsKey(playerPrefabNetworkObject`
Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ public static void NetworkHide(List<NetworkObject> networkObjects, ulong clientI`
`435`	`435`	`private void OnDestroy()`
`436`	`436`	`{`
`437`	`437`	`if (NetworkManager != null && NetworkManager.IsListening && NetworkManager.IsServer == false && IsSpawned &&`
`438`		`- (IsSceneObject == null \|\| (IsSceneObject != null && IsSceneObject.Value != true)))`
	`438`	`+ (IsSceneObject == null \|\| (IsSceneObject.Value != true)))`
`439`	`439`	`{`
`440`	`440`	`throw new NotServerException($"Destroy a spawned {nameof(NetworkObject)} on a non-host client is not valid. Call {nameof(Destroy)} or {nameof(Despawn)} on the server/host instead.");`
`441`	`441`	`}`
`@@ -690,8 +690,7 @@ private void OnTransformParentChanged()`
`690`	`690`	`var parentTransform = transform.parent;`
`691`	`691`	`if (parentTransform != null)`
`692`	`692`	`{`
`693`		`- var parentObject = transform.parent.GetComponent<NetworkObject>();`
`694`		`- if (parentObject == null)`
	`693`	`+ if (!transform.parent.TryGetComponent<NetworkObject>(out var parentObject))`
`695`	`694`	`{`
`696`	`695`	`transform.parent = m_CachedParent;`
`697`	`696`	`Debug.LogException(new InvalidParentException($"Invalid parenting, {nameof(NetworkObject)} moved under a non-{nameof(NetworkObject)} parent"));`
Original file line number	Diff line number	Diff line change
`@@ -119,8 +119,7 @@ public void RegisterHostGlobalObjectIdHashValues(GameObject sourceNetworkPrefab,`
`119`	`119`	`// Now we register all`
`120`	`120`	`foreach (var gameObject in networkPrefabOverrides)`
`121`	`121`	`{`
`122`		`- var targetNetworkObject = gameObject.GetComponent<NetworkObject>();`
`123`		`- if (targetNetworkObject != null)`
	`122`	`+ if (gameObject.TryGetComponent<NetworkObject>(out var targetNetworkObject))`
`124`	`123`	`{`
`125`	`124`	`if (!m_PrefabInstanceToPrefabAsset.ContainsKey(targetNetworkObject.GlobalObjectIdHash))`
`126`	`125`	`{`
Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ private static NetworkEndpoint ParseNetworkEndpoint(string ip, ushort port)`
`306`	`306`	`/// <summary>`
`307`	`307`	`/// Endpoint (IP address and port) server will listen/bind on.`
`308`	`308`	`/// </summary>`
`309`		`- public NetworkEndpoint ListenEndPoint => ParseNetworkEndpoint((ServerListenAddress == string.Empty) ? Address : ServerListenAddress, Port);`
	`309`	`+ public NetworkEndpoint ListenEndPoint => ParseNetworkEndpoint((ServerListenAddress?.Length == 0) ? Address : ServerListenAddress, Port);`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`/// <summary>`