fix: Parented in-scene objects under dynamically spawned objects are destroyed when the network session ends but original scene remains loaded. [MTT-7560] #2737
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes the issue with an in-scene placed NetworkObject being parented under a dynamically spawned NetworkObject and a sudden shutdown/exit occurs. This will remove the child in-scene placed NetworkObject from the parent during the NetworkManager shutdown process where it destroys all dynamically spawned NetworkObjects.
NoelStephensUnity
changed the title
fixing bad changelog merge
ShadauxCat
reviewed
Nov 27, 2023
| // - This instance is not spawned and the parent is. | ||
| // Basically, don't allow parenting when either the child or parent is not spawned. | ||
| // Caveat: if the parent is null then we can allow parenting whether the instance is or is not spawned. | ||
| if (parent != null && (IsSpawned && !parent.IsSpawned || !IsSpawned && parent.IsSpawned)) |
There was a problem hiding this comment.
Totally optional comment, BUT... (IsSpawned && !parent.IsSpawned || !IsSpawned && parent.IsSpawned) could be simplified to IsSpawned ^ parent.IsSpawned.
There was a problem hiding this comment.
Nice XOR usage suggestion!
ShadauxCat
approved these changes
Nov 27, 2023
fixing merge issues
NoelStephensUnity
deleted the
fix/child-in-scene-objects-destroyed-client-side
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(Discovered using internal modified Client Driven Testing Tool)
In-scene placed NetworkObjects that are parented under dynamically spawned Networkobjects should not be destroyed on the client side (i.e. when the scene is unloaded it will/should be destroyed). Likewise, on the server-host side, if the in-scene placed NetworkObject is marked with "Don't Destroy with Owner" then the server-host should not allow it to be destroyed when shutting down a session (i.e. when the scene is unloaded it will/should be destroyed).
MTT-7560
Changelog
NetworkObjectwould be destroyed upon a client or server exiting a network session but not unloading the original scene in which theNetworkObjectwas placed.Testing and Documentation
SceneObjectsNotDestroyedOnShutdownTest.SceneObjectsNotDestroyedOnShutdown.SceneObjectsNotDestroyedOnShutdownTest.ChildSceneObjectsDoNotDestroyOnShutdown.