Skip to content

fix: NetworkManager doesn't destroy itself on multi instance #765

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 16 commits into from
Apr 29, 2021
Merged

fix: NetworkManager doesn't destroy itself on multi instance #765

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6759fa6
refactor!: NetworkBehaviour and NetworkObject NetworkManager instance…
TwoTenPvP Apr 23, 2021
6d10294
test cleans up
TwoTenPvP Apr 23, 2021
95a6202
refactor: FindObject(s)OfType now filters NetworkManagers
TwoTenPvP Apr 23, 2021
acdcba9
Merge branch 'develop' into singleton-removal-network-object
TwoTenPvP Apr 23, 2021
ee4160c
fix: NetworkManager doesn't destroy itself on multi instance
TwoTenPvP Apr 23, 2021
2074020
NetworkBehaviour now uses local NetworkManager property
TwoTenPvP Apr 23, 2021
dbb8b1b
Added comments to NetworkManagerOwner
TwoTenPvP Apr 23, 2021
8181577
Added inspector NetworkManager name
TwoTenPvP Apr 23, 2021
76344de
fix name
TwoTenPvP Apr 23, 2021
42198eb
Use nameof
TwoTenPvP Apr 23, 2021
2b0979a
Merge branch 'singleton-removal-network-object' into singleton-remova…
TwoTenPvP Apr 23, 2021
2651edd
Merge branch 'singleton-removal-find-objects' into singleton-removal-…
TwoTenPvP Apr 23, 2021
c306a63
minor bug fix
TwoTenPvP Apr 26, 2021
c925c88
Merge branch 'develop' into singleton-removal-singleton-set
TwoTenPvP Apr 27, 2021
b1f69f6
Merge branch 'develop' into singleton-removal-singleton-set
TwoTenPvP Apr 29, 2021
2843af7
fix OnDestroy not calling shutdown for secondary NetworkManager
TwoTenPvP Apr 29, 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
18 changes: 8 additions & 10 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 @@ -719,14 +719,6 @@ private void Awake()

private void OnEnable()
{
if (Singleton != null && Singleton != this)
{
Destroy(gameObject);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not super familiar with what this code does, but when I read the PR title I anticipated to see "if multi-scene, don't destroy, else still do" but what I see here is we don't destroy the game object anymore

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it makes no sense for us to destroy it. I can't remember why I did it that way.

Basically what this used to do was:

If there was a NetworkManager already, destroy myself.

Now it doesn't destroy it anymore. That's the only difference.

return;
}

SetSingleton();

if (DontDestroy)
{
DontDestroyOnLoad(gameObject);
Expand All @@ -736,13 +728,19 @@ private void OnEnable()
{
Application.runInBackground = true;
}

if (Singleton == null)
{
SetSingleton();
}
}

private void OnDestroy()
{
if (Singleton != null && Singleton == this)
Shutdown();

if (Singleton == this)
{
Shutdown();
Singleton = null;
}
}
Expand Down