Skip to content

Conversation

NoelStephensUnity
Copy link
Collaborator

@NoelStephensUnity NoelStephensUnity commented Jun 2, 2025

Based on issue #3472, this PR resolves the issue where the NetworkObject.DontDestroyWithOwner was not being honored.

Changelog

  • Fixed: Issue where the NetworkObject.DontDestroyWithOwner was not being honored.

Testing and Documentation

  • Includes integration test NetworkObjectDontDestroyWithOwnerTests.NetworkShowThenClientDisconnects.
  • No documentation changes or additions were necessary.

Backport

The v1.x branch does no have this issue, but went ahead and backported the test in #3478.

Fixing issue where dont destroy with owner was not being honored.
Adding another integration test to validate this fix.
@NoelStephensUnity NoelStephensUnity marked this pull request as ready for review June 2, 2025 21:17
@NoelStephensUnity NoelStephensUnity requested a review from a team as a code owner June 2, 2025 21:17
Copy link
Collaborator

@EmandM EmandM left a comment

Choose a reason for hiding this comment

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

🚀

@EmandM EmandM enabled auto-merge (squash) June 2, 2025 21:25
NoelStephensUnity and others added 3 commits June 2, 2025 16:26
Reverting one change that was not needed for this fix.
NoelStephensUnity added a commit that referenced this pull request Jun 3, 2025
…t Backport of 3477] (#3478)

The v1.x branch does not have the same issue as #3477. This PR is only
the backport of the test added to 3477 to assure we have the same kind
of coverage in both versions.

## Changelog

NA

## Testing and Documentation

- Includes integration test
`NetworkObjectDontDestroyWithOwnerTests.NetworkShowThenClientDisconnects`.
- No documentation changes or additions were necessary.


<!-- Uncomment and mark items off with a * if this PR deprecates any
API:
### Deprecated API
- [ ] An `[Obsolete]` attribute was added along with a `(RemovedAfter
yyyy-mm-dd)` entry.
- [ ] An [api updater] was added.
- [ ] Deprecation of the API is explained in the CHANGELOG.
- [ ] The users can understand why this API was removed and what they
should use instead.
-->

## Backport
This is a test-only backport of #3477.
<!-- If this is a backport:
 - Add the following to the PR title: "\[Backport\] ..." .
 - Link to the original PR.
If this needs a backport - state this here
If a backport is not needed please provide the reason why.
If the "Backports" section is not present it will lead to a CI test
failure.
-->
@EmandM EmandM merged commit 985453a into develop-2.0.0 Jun 3, 2025
42 checks passed
@EmandM EmandM deleted the fix/dont-destroy-with-owner-not-being-honored-when-client-exits branch June 3, 2025 00:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
port:1.x-completed This issue was ported to 1.X branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants