Skip to content

fix: revert ReferenceEquals() checks back #587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattwalsh-unity merged 1 commit into from
Mar 11, 2021
Merged

fix: revert ReferenceEquals() checks back #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions com.unity.multiplayer.mlapi/Editor/NetworkAnimatorEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -75,4 +75,4 @@ public override void OnInspectorGUI()
serializedObject.ApplyModifiedProperties();
}
}
}
}
2 changes: 1 addition & 1 deletion com.unity.multiplayer.mlapi/Editor/NetworkManagerEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
}
Expand Down
4 changes: 2 additions & 2 deletions com.unity.multiplayer.mlapi/Editor/NetworkObjectEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down Expand Up @@ -84,4 +84,4 @@ public override void OnInspectorGUI()
}
}
}
}
}
6 changes: 3 additions & 3 deletions com.unity.multiplayer.mlapi/Prototyping/NetworkNavMeshAgent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand Down Expand Up @@ -114,4 +114,4 @@ private void OnNavMeshCorrectionUpdateClientRpc(Vector3 velocity, Vector3 positi
m_Agent.velocity = velocity;
}
}
}
}
6 changes: 3 additions & 3 deletions com.unity.multiplayer.mlapi/Runtime/Configuration/NetworkPrefab.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ internal ulong Hash
{
get
{
if (ReferenceEquals(Prefab, null))
if (Prefab == null)
{
if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
{
Expand All @@ -25,7 +25,7 @@ internal ulong Hash
}

var networkObject = Prefab.GetComponent<NetworkObject>();
if (ReferenceEquals(networkObject, null))
if (networkObject == null)
{
if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
{
Expand All @@ -49,4 +49,4 @@ internal ulong Hash
/// </summary>
public bool PlayerPrefab;
}
}
}
10 changes: 5 additions & 5 deletions com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?");
}
Expand All @@ -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;
}
}

Expand Down Expand Up @@ -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;
}
}
}
10 changes: 5 additions & 5 deletions com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -582,7 +582,7 @@ private void OnEnable()

private void OnDestroy()
{
if (!ReferenceEquals(Singleton, null) && Singleton == this)
if (Singleton != null && Singleton == this)
{
Shutdown();
Singleton = null;
Expand Down Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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;
}
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions com.unity.multiplayer.mlapi/Runtime/Logging/NetworkLog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}");
Expand Down Expand Up @@ -83,4 +83,4 @@ internal enum LogType
None
}
}
}
}
2 changes: 1 addition & 1 deletion com.unity.multiplayer.mlapi/Runtime/Serialization/NetworkWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}");
}
Expand Down
18 changes: 9 additions & 9 deletions com.unity.multiplayer.mlapi/Runtime/Spawning/NetworkSpawnManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand All @@ -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");
}
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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))
{
Expand Down