Skip to content

fix: NetworkManager property more robust on NetworkBehaviour #2257

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 3 commits into from
Oct 19, 2022
Merged

fix: NetworkManager property more robust on NetworkBehaviour #2257

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db38639
fix: more robust checks around NetworkObjects being null
jeffreyrainy Oct 14, 2022
8ce5829
Merge remote-tracking branch 'origin/develop' into fix/mtt-3376/load-…
jeffreyrainy Oct 18, 2022
73d8171
Merge branch 'develop' into fix/mtt-3376/load-event-complete-shutdown
jeffreyrainy Oct 18, 2022
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
24 changes: 21 additions & 3 deletions com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviour.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,18 @@ internal string GenerateObserverErrorMessage(ClientRpcParams clientRpcParams, ul
/// Gets the NetworkManager that owns this NetworkBehaviour instance
/// See note around `NetworkObject` for how there is a chicken / egg problem when we are not initialized
/// </summary>
public NetworkManager NetworkManager => NetworkObject.NetworkManager;
public NetworkManager NetworkManager
{
get
{
if (NetworkObject?.NetworkManager != null)
{
return NetworkObject?.NetworkManager;
}

return NetworkManager.Singleton;
}
}

/// <summary>
/// If a NetworkObject is assigned, it will return whether or not this NetworkObject
Expand Down Expand Up @@ -349,9 +360,16 @@ public NetworkObject NetworkObject
{
get
{
if (m_NetworkObject == null)
try
{
if (m_NetworkObject == null)
{
m_NetworkObject = GetComponentInParent<NetworkObject>();
}
}
catch (Exception)
{
m_NetworkObject = GetComponentInParent<NetworkObject>();
return null;
}

// ShutdownInProgress check:
Expand Down