fix: revert ReferenceEquals() checks back to Unity's custom == equality operator checks (#587)

0xFA11 · web-flow · commit 36607e729078 · 2021-03-10T19:38:40.000-08:00
diff --git a/com.unity.multiplayer.mlapi/Editor/NetworkAnimatorEditor.cs b/com.unity.multiplayer.mlapi/Editor/NetworkAnimatorEditor.cs
@@ -35,10 +35,10 @@ private void DrawControls()
             if (EditorGUI.EndChangeCheck()) m_Target.ResetTrackedParams();
 
             var animator = m_Target.Animator;
-            if (ReferenceEquals(animator, null)) return;
+            if (animator == null) return;
 
             var animatorController = animator.runtimeAnimatorController as AnimatorController;
-            if (ReferenceEquals(animatorController, null)) return;
+            if (animatorController == null) return;
 
             EditorGUI.indentLevel += 1;
             var showWarning = false;
@@ -75,4 +75,4 @@ public override void OnInspectorGUI()
             serializedObject.ApplyModifiedProperties();
         }
     }
-}
+}
diff --git a/com.unity.multiplayer.mlapi/Editor/NetworkManagerEditor.cs b/com.unity.multiplayer.mlapi/Editor/NetworkManagerEditor.cs
@@ -266,7 +266,7 @@ public override void OnInspectorGUI()
 
                     var transportComponent = m_NetworkManager.gameObject.GetComponent(m_TransportTypes[selection - 1]);
 
-                    if (ReferenceEquals(transportComponent, null))
+                    if (transportComponent == null)
                     {
                         transportComponent = m_NetworkManager.gameObject.AddComponent(m_TransportTypes[selection - 1]);
                     }
diff --git a/com.unity.multiplayer.mlapi/Editor/NetworkObjectEditor.cs b/com.unity.multiplayer.mlapi/Editor/NetworkObjectEditor.cs
@@ -24,7 +24,7 @@ public override void OnInspectorGUI()
         {
             Init();
 
-            if (!m_NetworkObject.IsSpawned && !ReferenceEquals(NetworkManager.Singleton, null) && NetworkManager.Singleton.IsServer)
+            if (!m_NetworkObject.IsSpawned && NetworkManager.Singleton != null && NetworkManager.Singleton.IsServer)
             {
                 EditorGUILayout.BeginHorizontal();
                 EditorGUILayout.LabelField(new GUIContent("Spawn", "Spawns the object across the network"));
@@ -84,4 +84,4 @@ public override void OnInspectorGUI()
             }
         }
     }
-}
+}
diff --git a/com.unity.multiplayer.mlapi/Prototyping/NetworkNavMeshAgent.cs b/com.unity.multiplayer.mlapi/Prototyping/NetworkNavMeshAgent.cs
@@ -65,7 +65,7 @@ private void Update()
                     var proximityClients = new List<ulong>();
                     foreach (KeyValuePair<ulong, NetworkClient> client in NetworkManager.Singleton.ConnectedClients)
                     {
-                        if (ReferenceEquals(client.Value.PlayerObject, null) || Vector3.Distance(client.Value.PlayerObject.transform.position, transform.position) <= ProximityRange)
+                        if (client.Value.PlayerObject == null || Vector3.Distance(client.Value.PlayerObject.transform.position, transform.position) <= ProximityRange)
                         {
                             proximityClients.Add(client.Key);
                         }
@@ -86,7 +86,7 @@ private void Update()
                     var proximityClients = new List<ulong>();
                     foreach (KeyValuePair<ulong, NetworkClient> client in NetworkManager.Singleton.ConnectedClients)
                     {
-                        if (ReferenceEquals(client.Value.PlayerObject, null) || Vector3.Distance(client.Value.PlayerObject.transform.position, transform.position) <= ProximityRange)
+                        if (client.Value.PlayerObject == null || Vector3.Distance(client.Value.PlayerObject.transform.position, transform.position) <= ProximityRange)
                         {
                             proximityClients.Add(client.Key);
                         }
@@ -114,4 +114,4 @@ private void OnNavMeshCorrectionUpdateClientRpc(Vector3 velocity, Vector3 positi
             m_Agent.velocity = velocity;
         }
     }
-}
+}
diff --git a/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkPrefab.cs b/com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkPrefab.cs
@@ -14,7 +14,7 @@ internal ulong Hash
         {
             get
             {
-                if (ReferenceEquals(Prefab, null))
+                if (Prefab == null)
                 {
                     if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
                     {
@@ -25,7 +25,7 @@ internal ulong Hash
                 }
 
                 var networkObject = Prefab.GetComponent<NetworkObject>();
-                if (ReferenceEquals(networkObject, null))
+                if (networkObject == null)
                 {
                     if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
                     {
@@ -49,4 +49,4 @@ internal ulong Hash
         /// </summary>
         public bool PlayerPrefab;
     }
-}
+}
diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs
@@ -272,12 +272,12 @@ public NetworkObject NetworkObject
         {
             get
             {
-                if (ReferenceEquals(m_NetworkObject, null))
+                if (m_NetworkObject == null)
                 {
                     m_NetworkObject = GetComponentInParent<NetworkObject>();
                 }
 
-                if (ReferenceEquals(m_NetworkObject, null))
+                if (m_NetworkObject == null)
                 {
                     throw new NullReferenceException($"Could not get {nameof(NetworkObject)} for the {nameof(NetworkBehaviour)}. Are you missing a {nameof(NetworkObject)} component?");
                 }
@@ -293,12 +293,12 @@ public bool HasNetworkObject
         {
             get
             {
-                if (ReferenceEquals(m_NetworkObject, null))
+                if (m_NetworkObject == null)
                 {
                     m_NetworkObject = GetComponentInParent<NetworkObject>();
                 }
 
-                return !ReferenceEquals(m_NetworkObject, null);
+                return m_NetworkObject != null;
             }
         }
 
@@ -949,4 +949,4 @@ internal static void SetNetworkVariableData(List<INetworkVariable> networkVariab
         /// <returns></returns>
         protected NetworkObject GetNetworkObject(ulong networkId) => NetworkSpawnManager.SpawnedObjects.ContainsKey(networkId) ? NetworkSpawnManager.SpawnedObjects[networkId] : null;
     }
-}
+}
diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs
@@ -305,7 +305,7 @@ private void Init(bool server)
             NetworkSceneManager.SceneNameToIndex.Clear();
             NetworkSceneManager.SceneSwitchProgresses.Clear();
 
-            if (ReferenceEquals(NetworkConfig.NetworkTransport, null))
+            if (NetworkConfig.NetworkTransport == null)
             {
                 if (NetworkLog.CurrentLogLevel <= LogLevel.Error) NetworkLog.LogError("No transport has been selected!");
                 return;
@@ -356,14 +356,14 @@ private void Init(bool server)
 
             for (int i = 0; i < NetworkConfig.NetworkPrefabs.Count; i++)
             {
-                if (NetworkConfig.NetworkPrefabs[i] == null || ReferenceEquals(NetworkConfig.NetworkPrefabs[i].Prefab, null))
+                if (NetworkConfig.NetworkPrefabs[i] == null || NetworkConfig.NetworkPrefabs[i].Prefab == null)
                 {
                     if (NetworkLog.CurrentLogLevel <= LogLevel.Error)
                     {
                         NetworkLog.LogError($"{nameof(NetworkPrefab)} cannot be null ({nameof(NetworkPrefab)} at index: {i})");
                     }
                 }
-                else if (ReferenceEquals(NetworkConfig.NetworkPrefabs[i].Prefab.GetComponent<NetworkObject>(), null))
+                else if (NetworkConfig.NetworkPrefabs[i].Prefab.GetComponent<NetworkObject>() == null)
                 {
                     if (NetworkLog.CurrentLogLevel <= LogLevel.Error)
                     {
@@ -582,7 +582,7 @@ private void OnEnable()
 
         private void OnDestroy()
         {
-            if (!ReferenceEquals(Singleton, null) && Singleton == this)
+            if (Singleton != null && Singleton == this)
             {
                 Shutdown();
                 Singleton = null;
@@ -1118,7 +1118,7 @@ internal static void InvokeRpc(RpcFrameQueueItem queueItem)
                 var networkObject = NetworkSpawnManager.SpawnedObjects[networkObjectId];
 
                 var networkBehaviour = networkObject.GetNetworkBehaviourAtOrderIndex(networkBehaviourId);
-                if (ReferenceEquals(networkBehaviour, null)) return;
+                if (networkBehaviour == null) return;
 
                 var rpcParams = new __RpcParams();
                 switch (queueItem.QueueItemType)
diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs
@@ -55,7 +55,7 @@ public ulong OwnerClientId
             {
                 if (OwnerClientIdInternal == null)
                 {
-                    return !ReferenceEquals(NetworkManager.Singleton, null) ? NetworkManager.Singleton.ServerClientId : 0;
+                    return NetworkManager.Singleton != null ? NetworkManager.Singleton.ServerClientId : 0;
                 }
                 else
                 {
@@ -64,7 +64,7 @@ public ulong OwnerClientId
             }
             internal set
             {
-                if (!ReferenceEquals(NetworkManager.Singleton, null) && value == NetworkManager.Singleton.ServerClientId)
+                if (NetworkManager.Singleton != null && value == NetworkManager.Singleton.ServerClientId)
                 {
                     OwnerClientIdInternal = null;
                 }
@@ -114,17 +114,17 @@ internal set
         /// <summary>
         /// Gets if the object is the the personal clients player object
         /// </summary>
-        public bool IsLocalPlayer => !ReferenceEquals(NetworkManager.Singleton, null) && IsPlayerObject && OwnerClientId == NetworkManager.Singleton.LocalClientId;
+        public bool IsLocalPlayer => NetworkManager.Singleton != null && IsPlayerObject && OwnerClientId == NetworkManager.Singleton.LocalClientId;
 
         /// <summary>
         /// Gets if the object is owned by the local player or if the object is the local player object
         /// </summary>
-        public bool IsOwner => !ReferenceEquals(NetworkManager.Singleton, null) && OwnerClientId == NetworkManager.Singleton.LocalClientId;
+        public bool IsOwner => NetworkManager.Singleton != null && OwnerClientId == NetworkManager.Singleton.LocalClientId;
 
         /// <summary>
         /// Gets Whether or not the object is owned by anyone
         /// </summary>
-        public bool IsOwnedByServer => !ReferenceEquals(NetworkManager.Singleton, null) && OwnerClientId == NetworkManager.Singleton.ServerClientId;
+        public bool IsOwnedByServer => NetworkManager.Singleton != null && OwnerClientId == NetworkManager.Singleton.ServerClientId;
 
         /// <summary>
         /// Gets if the object has yet been spawned across the network
diff --git a/com.unity.multiplayer.mlapi/Runtime/Logging/NetworkLog.cs b/com.unity.multiplayer.mlapi/Runtime/Logging/NetworkLog.cs
@@ -15,7 +15,7 @@ public static class NetworkLog
         /// Gets the current log level.
         /// </summary>
         /// <value>The current log level.</value>
-        internal static LogLevel CurrentLogLevel => ReferenceEquals(NetworkManager.Singleton, null) ? LogLevel.Normal : NetworkManager.Singleton.LogLevel;
+        internal static LogLevel CurrentLogLevel => NetworkManager.Singleton == null ? LogLevel.Normal : NetworkManager.Singleton.LogLevel;
 
         // MLAPI internal logging
         internal static void LogInfo(string message) => Debug.Log($"[MLAPI] {message}");
@@ -83,4 +83,4 @@ internal enum LogType
             None
         }
     }
-}
+}
diff --git a/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkWriter.cs b/com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkWriter.cs
@@ -193,7 +193,7 @@ public void WriteObjectPacked(object value)
             else if (value is GameObject)
             {
                 var networkObject = ((GameObject)value).GetComponent<NetworkObject>();
-                if (ReferenceEquals(networkObject, null))
+                if (networkObject == null)
                 {
                     throw new ArgumentException($"{nameof(NetworkWriter)} cannot write {nameof(GameObject)} types that does not has a {nameof(NetworkObject)} component attached. {nameof(GameObject)}: {((GameObject)value).name}");
                 }
diff --git a/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManager.cs b/com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManager.cs
@@ -262,7 +262,7 @@ internal static NetworkObject CreateLocalNetworkObject(bool softCreate, ulong in
                 {
                     var networkObject = CustomSpawnHandlers[prefabHash](position.GetValueOrDefault(Vector3.zero), rotation.GetValueOrDefault(Quaternion.identity));
 
-                    if (!ReferenceEquals(parentNetworkObject, null))
+                    if (parentNetworkObject != null)
                     {
                         networkObject.transform.SetParent(parentNetworkObject.transform, true);
                     }
@@ -291,7 +291,7 @@ internal static NetworkObject CreateLocalNetworkObject(bool softCreate, ulong in
                     var prefab = NetworkManager.Singleton.NetworkConfig.NetworkPrefabs[prefabIndex].Prefab;
                     var networkObject = ((position == null && rotation == null) ? MonoBehaviour.Instantiate(prefab) : MonoBehaviour.Instantiate(prefab, position.GetValueOrDefault(Vector3.zero), rotation.GetValueOrDefault(Quaternion.identity))).GetComponent<NetworkObject>();
 
-                    if (!ReferenceEquals(parentNetworkObject, null))
+                    if (parentNetworkObject != null)
                     {
                         networkObject.transform.SetParent(parentNetworkObject.transform, true);
                     }
@@ -320,7 +320,7 @@ internal static NetworkObject CreateLocalNetworkObject(bool softCreate, ulong in
                 var networkObject = PendingSoftSyncObjects[instanceId];
                 PendingSoftSyncObjects.Remove(instanceId);
 
-                if (!ReferenceEquals(parentNetworkObject, null))
+                if (parentNetworkObject != null)
                 {
                     networkObject.transform.SetParent(parentNetworkObject.transform, true);
                 }
@@ -332,7 +332,7 @@ internal static NetworkObject CreateLocalNetworkObject(bool softCreate, ulong in
         // Ran on both server and client
         internal static void SpawnNetworkObjectLocally(NetworkObject networkObject, ulong networkId, bool sceneObject, bool playerObject, ulong? ownerClientId, Stream dataStream, bool readPayload, int payloadLength, bool readNetworkVariable, bool destroyWithScene)
         {
-            if (ReferenceEquals(networkObject, null))
+            if (networkObject == null)
             {
                 throw new ArgumentNullException(nameof(networkObject), "Cannot spawn null object");
             }
@@ -447,12 +447,12 @@ internal static void WriteSpawnCallForObject(Serialization.NetworkBuffer buffer,
 
                 NetworkObject parentNetworkObject = null;
 
-                if (!networkObject.AlwaysReplicateAsRoot && !ReferenceEquals(networkObject.transform.parent, null))
+                if (!networkObject.AlwaysReplicateAsRoot && networkObject.transform.parent != null)
                 {
                     parentNetworkObject = networkObject.transform.parent.GetComponent<NetworkObject>();
                 }
 
-                if (ReferenceEquals(parentNetworkObject, null))
+                if (parentNetworkObject == null)
                 {
                     writer.WriteBool(false);
                 }
@@ -652,7 +652,7 @@ internal static void ClientCollectSoftSyncSceneObjectSweep(NetworkObject[] netwo
 
         internal static void OnDestroyObject(ulong networkId, bool destroyGameObject)
         {
-            if (ReferenceEquals(NetworkManager.Singleton, null)) return;
+            if (NetworkManager.Singleton == null) return;
 
             //Removal of spawned object
             if (!SpawnedObjects.ContainsKey(networkId))
@@ -691,7 +691,7 @@ internal static void OnDestroyObject(ulong networkId, bool destroyGameObject)
                 var rpcQueueContainer = NetworkManager.Singleton.RpcQueueContainer;
                 if (rpcQueueContainer != null)
                 {
-                    if (!ReferenceEquals(sobj, null))
+                    if (sobj != null)
                     {
                         // As long as we have any remaining clients, then notify of the object being destroy.
                         if (NetworkManager.Singleton.ConnectedClientsList.Count > 0)
@@ -720,7 +720,7 @@ internal static void OnDestroyObject(ulong networkId, bool destroyGameObject)
 
             var gobj = sobj.gameObject;
 
-            if (destroyGameObject && !ReferenceEquals(gobj, null))
+            if (destroyGameObject && gobj != null)
             {
                 if (CustomDestroyHandlers.ContainsKey(sobj.PrefabHash))
                 {

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ public override void OnInspectorGUI()`
`266`	`266`
`267`	`267`	`var transportComponent = m_NetworkManager.gameObject.GetComponent(m_TransportTypes[selection - 1]);`
`268`	`268`
`269`		`- if (ReferenceEquals(transportComponent, null))`
	`269`	`+ if (transportComponent == null)`
`270`	`270`	`{`
`271`	`271`	`transportComponent = m_NetworkManager.gameObject.AddComponent(m_TransportTypes[selection - 1]);`
`272`	`272`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public override void OnInspectorGUI()`
`24`	`24`	`{`
`25`	`25`	`Init();`
`26`	`26`
`27`		`- if (!m_NetworkObject.IsSpawned && !ReferenceEquals(NetworkManager.Singleton, null) && NetworkManager.Singleton.IsServer)`
	`27`	`+ if (!m_NetworkObject.IsSpawned && NetworkManager.Singleton != null && NetworkManager.Singleton.IsServer)`
`28`	`28`	`{`
`29`	`29`	`EditorGUILayout.BeginHorizontal();`
`30`	`30`	`EditorGUILayout.LabelField(new GUIContent("Spawn", "Spawns the object across the network"));`
`@@ -84,4 +84,4 @@ public override void OnInspectorGUI()`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`	`}`
`87`		`-}`
	`87`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ private void Update()`
`65`	`65`	`var proximityClients = new List<ulong>();`
`66`	`66`	`foreach (KeyValuePair<ulong, NetworkClient> client in NetworkManager.Singleton.ConnectedClients)`
`67`	`67`	`{`
`68`		`- if (ReferenceEquals(client.Value.PlayerObject, null) \|\| Vector3.Distance(client.Value.PlayerObject.transform.position, transform.position) <= ProximityRange)`
	`68`	`+ if (client.Value.PlayerObject == null \|\| Vector3.Distance(client.Value.PlayerObject.transform.position, transform.position) <= ProximityRange)`
`69`	`69`	`{`
`70`	`70`	`proximityClients.Add(client.Key);`
`71`	`71`	`}`
`@@ -86,7 +86,7 @@ private void Update()`
`86`	`86`	`var proximityClients = new List<ulong>();`
`87`	`87`	`foreach (KeyValuePair<ulong, NetworkClient> client in NetworkManager.Singleton.ConnectedClients)`
`88`	`88`	`{`
`89`		`- if (ReferenceEquals(client.Value.PlayerObject, null) \|\| Vector3.Distance(client.Value.PlayerObject.transform.position, transform.position) <= ProximityRange)`
	`89`	`+ if (client.Value.PlayerObject == null \|\| Vector3.Distance(client.Value.PlayerObject.transform.position, transform.position) <= ProximityRange)`
`90`	`90`	`{`
`91`	`91`	`proximityClients.Add(client.Key);`
`92`	`92`	`}`
`@@ -114,4 +114,4 @@ private void OnNavMeshCorrectionUpdateClientRpc(Vector3 velocity, Vector3 positi`
`114`	`114`	`m_Agent.velocity = velocity;`
`115`	`115`	`}`
`116`	`116`	`}`
`117`		`-}`
	`117`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ internal ulong Hash`
`14`	`14`	`{`
`15`	`15`	`get`
`16`	`16`	`{`
`17`		`- if (ReferenceEquals(Prefab, null))`
	`17`	`+ if (Prefab == null)`
`18`	`18`	`{`
`19`	`19`	`if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)`
`20`	`20`	`{`
`@@ -25,7 +25,7 @@ internal ulong Hash`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`var networkObject = Prefab.GetComponent<NetworkObject>();`
`28`		`- if (ReferenceEquals(networkObject, null))`
	`28`	`+ if (networkObject == null)`
`29`	`29`	`{`
`30`	`30`	`if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)`
`31`	`31`	`{`
`@@ -49,4 +49,4 @@ internal ulong Hash`
`49`	`49`	`/// </summary>`
`50`	`50`	`public bool PlayerPrefab;`
`51`	`51`	`}`
`52`		`-}`
	`52`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -272,12 +272,12 @@ public NetworkObject NetworkObject`
`272`	`272`	`{`
`273`	`273`	`get`
`274`	`274`	`{`
`275`		`- if (ReferenceEquals(m_NetworkObject, null))`
	`275`	`+ if (m_NetworkObject == null)`
`276`	`276`	`{`
`277`	`277`	`m_NetworkObject = GetComponentInParent<NetworkObject>();`
`278`	`278`	`}`
`279`	`279`
`280`		`- if (ReferenceEquals(m_NetworkObject, null))`
	`280`	`+ if (m_NetworkObject == null)`
`281`	`281`	`{`
`282`	`282`	`throw new NullReferenceException($"Could not get {nameof(NetworkObject)} for the {nameof(NetworkBehaviour)}. Are you missing a {nameof(NetworkObject)} component?");`
`283`	`283`	`}`
`@@ -293,12 +293,12 @@ public bool HasNetworkObject`
`293`	`293`	`{`
`294`	`294`	`get`
`295`	`295`	`{`
`296`		`- if (ReferenceEquals(m_NetworkObject, null))`
	`296`	`+ if (m_NetworkObject == null)`
`297`	`297`	`{`
`298`	`298`	`m_NetworkObject = GetComponentInParent<NetworkObject>();`
`299`	`299`	`}`
`300`	`300`
`301`		`- return !ReferenceEquals(m_NetworkObject, null);`
	`301`	`+ return m_NetworkObject != null;`
`302`	`302`	`}`
`303`	`303`	`}`
`304`	`304`
`@@ -949,4 +949,4 @@ internal static void SetNetworkVariableData(List<INetworkVariable> networkVariab`
`949`	`949`	`/// <returns></returns>`
`950`	`950`	`protected NetworkObject GetNetworkObject(ulong networkId) => NetworkSpawnManager.SpawnedObjects.ContainsKey(networkId) ? NetworkSpawnManager.SpawnedObjects[networkId] : null;`
`951`	`951`	`}`
`952`		`-}`
	`952`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ private void Init(bool server)`
`305`	`305`	`NetworkSceneManager.SceneNameToIndex.Clear();`
`306`	`306`	`NetworkSceneManager.SceneSwitchProgresses.Clear();`
`307`	`307`
`308`		`- if (ReferenceEquals(NetworkConfig.NetworkTransport, null))`
	`308`	`+ if (NetworkConfig.NetworkTransport == null)`
`309`	`309`	`{`
`310`	`310`	`if (NetworkLog.CurrentLogLevel <= LogLevel.Error) NetworkLog.LogError("No transport has been selected!");`
`311`	`311`	`return;`
`@@ -356,14 +356,14 @@ private void Init(bool server)`
`356`	`356`
`357`	`357`	`for (int i = 0; i < NetworkConfig.NetworkPrefabs.Count; i++)`
`358`	`358`	`{`
`359`		`- if (NetworkConfig.NetworkPrefabs[i] == null \|\| ReferenceEquals(NetworkConfig.NetworkPrefabs[i].Prefab, null))`
	`359`	`+ if (NetworkConfig.NetworkPrefabs[i] == null \|\| NetworkConfig.NetworkPrefabs[i].Prefab == null)`
`360`	`360`	`{`
`361`	`361`	`if (NetworkLog.CurrentLogLevel <= LogLevel.Error)`
`362`	`362`	`{`
`363`	`363`	`NetworkLog.LogError($"{nameof(NetworkPrefab)} cannot be null ({nameof(NetworkPrefab)} at index: {i})");`
`364`	`364`	`}`
`365`	`365`	`}`
`366`		`- else if (ReferenceEquals(NetworkConfig.NetworkPrefabs[i].Prefab.GetComponent<NetworkObject>(), null))`
	`366`	`+ else if (NetworkConfig.NetworkPrefabs[i].Prefab.GetComponent<NetworkObject>() == null)`
`367`	`367`	`{`
`368`	`368`	`if (NetworkLog.CurrentLogLevel <= LogLevel.Error)`
`369`	`369`	`{`
`@@ -582,7 +582,7 @@ private void OnEnable()`
`582`	`582`
`583`	`583`	`private void OnDestroy()`
`584`	`584`	`{`
`585`		`- if (!ReferenceEquals(Singleton, null) && Singleton == this)`
	`585`	`+ if (Singleton != null && Singleton == this)`
`586`	`586`	`{`
`587`	`587`	`Shutdown();`
`588`	`588`	`Singleton = null;`
`@@ -1118,7 +1118,7 @@ internal static void InvokeRpc(RpcFrameQueueItem queueItem)`
`1118`	`1118`	`var networkObject = NetworkSpawnManager.SpawnedObjects[networkObjectId];`
`1119`	`1119`
`1120`	`1120`	`var networkBehaviour = networkObject.GetNetworkBehaviourAtOrderIndex(networkBehaviourId);`
`1121`		`- if (ReferenceEquals(networkBehaviour, null)) return;`
	`1121`	`+ if (networkBehaviour == null) return;`
`1122`	`1122`
`1123`	`1123`	`var rpcParams = new __RpcParams();`
`1124`	`1124`	`switch (queueItem.QueueItemType)`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public ulong OwnerClientId`
`55`	`55`	`{`
`56`	`56`	`if (OwnerClientIdInternal == null)`
`57`	`57`	`{`
`58`		`- return !ReferenceEquals(NetworkManager.Singleton, null) ? NetworkManager.Singleton.ServerClientId : 0;`
	`58`	`+ return NetworkManager.Singleton != null ? NetworkManager.Singleton.ServerClientId : 0;`
`59`	`59`	`}`
`60`	`60`	`else`
`61`	`61`	`{`
`@@ -64,7 +64,7 @@ public ulong OwnerClientId`
`64`	`64`	`}`
`65`	`65`	`internal set`
`66`	`66`	`{`
`67`		`- if (!ReferenceEquals(NetworkManager.Singleton, null) && value == NetworkManager.Singleton.ServerClientId)`
	`67`	`+ if (NetworkManager.Singleton != null && value == NetworkManager.Singleton.ServerClientId)`
`68`	`68`	`{`
`69`	`69`	`OwnerClientIdInternal = null;`
`70`	`70`	`}`
`@@ -114,17 +114,17 @@ internal set`
`114`	`114`	`/// <summary>`
`115`	`115`	`/// Gets if the object is the the personal clients player object`
`116`	`116`	`/// </summary>`
`117`		`- public bool IsLocalPlayer => !ReferenceEquals(NetworkManager.Singleton, null) && IsPlayerObject && OwnerClientId == NetworkManager.Singleton.LocalClientId;`
	`117`	`+ public bool IsLocalPlayer => NetworkManager.Singleton != null && IsPlayerObject && OwnerClientId == NetworkManager.Singleton.LocalClientId;`
`118`	`118`
`119`	`119`	`/// <summary>`
`120`	`120`	`/// Gets if the object is owned by the local player or if the object is the local player object`
`121`	`121`	`/// </summary>`
`122`		`- public bool IsOwner => !ReferenceEquals(NetworkManager.Singleton, null) && OwnerClientId == NetworkManager.Singleton.LocalClientId;`
	`122`	`+ public bool IsOwner => NetworkManager.Singleton != null && OwnerClientId == NetworkManager.Singleton.LocalClientId;`
`123`	`123`
`124`	`124`	`/// <summary>`
`125`	`125`	`/// Gets Whether or not the object is owned by anyone`
`126`	`126`	`/// </summary>`
`127`		`- public bool IsOwnedByServer => !ReferenceEquals(NetworkManager.Singleton, null) && OwnerClientId == NetworkManager.Singleton.ServerClientId;`
	`127`	`+ public bool IsOwnedByServer => NetworkManager.Singleton != null && OwnerClientId == NetworkManager.Singleton.ServerClientId;`
`128`	`128`
`129`	`129`	`/// <summary>`
`130`	`130`	`/// Gets if the object has yet been spawned across the network`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public static class NetworkLog`
`15`	`15`	`/// Gets the current log level.`
`16`	`16`	`/// </summary>`
`17`	`17`	`/// <value>The current log level.</value>`
`18`		`- internal static LogLevel CurrentLogLevel => ReferenceEquals(NetworkManager.Singleton, null) ? LogLevel.Normal : NetworkManager.Singleton.LogLevel;`
	`18`	`+ internal static LogLevel CurrentLogLevel => NetworkManager.Singleton == null ? LogLevel.Normal : NetworkManager.Singleton.LogLevel;`
`19`	`19`
`20`	`20`	`// MLAPI internal logging`
`21`	`21`	`internal static void LogInfo(string message) => Debug.Log($"[MLAPI] {message}");`
`@@ -83,4 +83,4 @@ internal enum LogType`
`83`	`83`	`None`
`84`	`84`	`}`
`85`	`85`	`}`
`86`		`-}`
	`86`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ public void WriteObjectPacked(object value)`
`193`	`193`	`else if (value is GameObject)`
`194`	`194`	`{`
`195`	`195`	`var networkObject = ((GameObject)value).GetComponent<NetworkObject>();`
`196`		`- if (ReferenceEquals(networkObject, null))`
	`196`	`+ if (networkObject == null)`
`197`	`197`	`{`
`198`	`198`	`throw new ArgumentException($"{nameof(NetworkWriter)} cannot write {nameof(GameObject)} types that does not has a {nameof(NetworkObject)} component attached. {nameof(GameObject)}: {((GameObject)value).name}");`
`199`	`199`	`}`