Skip to content

fix: ServerDestroySpawnedSceneObjects throws an exception before switching scene #618

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 4 commits into from
Mar 15, 2021
Merged

fix: ServerDestroySpawnedSceneObjects throws an exception before switching scene #618

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f121029
fix: crash during scene transition
NoelStephensUnity Mar 15, 2021
7625e09
style: comments and standards
NoelStephensUnity Mar 15, 2021
c21123b
refactor: comments and better approach
NoelStephensUnity Mar 15, 2021
2377357
refactor: comment
NoelStephensUnity Mar 15, 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
11 changes: 10 additions & 1 deletion 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 @@ -541,19 +541,28 @@ internal static void ServerResetShudownStateForSceneObjects()
}
}

/// <summary>
/// Gets called only by NetworkSceneManager.SwitchScene
/// </summary>
internal static void ServerDestroySpawnedSceneObjects()
{
foreach (var sobj in SpawnedObjectsList)
//This Allocation is "ok" for now because this code only executes when a new scene is switched to

@mattwalsh-unity mattwalsh-unity Mar 15, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is this comment still real? I don't see an allocation per se...or do you mean the ToList() call?

@LukeStampfli LukeStampfli Mar 15, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Yes ToList creates a copy of the collection and allocates a new list object in the process.

//We need to create a new copy the HashSet of NetworkObjects (SpawnedObjectsList) so we can remove
//objects from the HashSet (SpawnedObjectsList) without causing a list has been modified exception to occur.
var spawnedObjects = SpawnedObjectsList.ToList();
foreach (var sobj in spawnedObjects)
{
if ((sobj.IsSceneObject != null && sobj.IsSceneObject == true) || sobj.DestroyWithScene)
{
if (CustomDestroyHandlers.ContainsKey(sobj.PrefabHash))
{
SpawnedObjectsList.Remove(sobj);
CustomDestroyHandlers[sobj.PrefabHash](sobj);
OnDestroyObject(sobj.NetworkObjectId, false);
}
else
{
SpawnedObjectsList.Remove(sobj);
MonoBehaviour.Destroy(sobj.gameObject);
}
}
Expand Down