Skip to content

refactor: NetworkBehaviour.NetworkObject no longer throws exception #838

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
merged 2 commits into from
May 18, 2021
Merged

refactor: NetworkBehaviour.NetworkObject no longer throws exception #838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3de5a05
refactor: NetworkBehaviour.NetworkObject no longer throws exception, …
0xFA11 May 17, 2021
1946c28
Merge branch 'develop' into refactor/netbhv-netobj-prop
0xFA11 May 18, 2021
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
17 changes: 3 additions & 14 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 @@ -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;
Expand All @@ -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;

Expand Down
14 changes: 2 additions & 12 deletions com.unity.multiplayer.mlapi/Tests/Editor/NetworkBehaviourTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down