fix: Ensure DisconnectReason remains parsable #3766
Merged
Conversation
This file contains hidden or 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
NoelStephensUnity
pushed a commit
that referenced
this pull request
Oct 31, 2025
NoelStephensUnity
added a commit
that referenced
this pull request
Oct 31, 2025
* Merge branch 'release/2.7.0' of https://github.com/Unity-Technologies/com.unity.netcode.gameobjects into release/2.7.0 * fix - revert Reverting changes made in 3664 with the time used when interpolating to local time. Added additional comments to prevent future fiddling with that (whether to use local or server time). * fix: Compilation error when using an RpcAttribute with RequireOwnership (#3750) * fix: clear DisconnectReason on server-side disconnect client (#3751) * fix Reset the disconnect reason when the server-side is disconnecting a client. * test Updating the disconnect test to validate that the disconnect reason is reset when a server force disconnects a client. * fix: Disabled Networkbehaviours are not excluded from NetworkObject.ChildNetworkBehaviours (#3756) * fix This resolves the issue where a disabled NetworkBehaviour was being included in the ChildNetworkBehaviours list which would cause an exception upon a client attempting to synchronize. * update Adding a warning generation method to make testing easier. * test Modifying the original test for this to assure it checks for the correct error message. * test - refactor Adding a bit more coverage to the `ValidatedDisableddNetworkBehaviourWarning` test so it validates that when either a child GameObject is set inactive or the NetworkBehaviiour itself is disabled the warning message is generated and the network prefab still spawns and synchronizes. * fix: disconnect reason should not duplicate any information (#3757) * fix Fixing issue with duplicated disconnect reasons for all cases. * test - update Making adjustments to the validation logic checking to determine if a server's disconnect reason is included in the NetworkManager.DisconnectReaon property. * style Removing a trailing whitespace * test - update One more area that needs to check for the server reason but not be a 1:1 due to the additional disconnect information before it. * fix: disabled NetworkBehaviours vs disabled GameObjects and tests excluded by lack of MP tools (#3761) * fix Use the GameObject.activeInHierarchy fix. Allow disabled NetworkBehaviour with a disabled GameObject to internally start pre-spawn but exit before invoking protected method. * test - update Re-factoring this test to align with the previously committed fix. * tests - enable Now that we have included the Mutliplayer Tools package in the test project, we needed to remove the !MULTIPLAYER_TOOLS check to assure these tests are actually being run. * fix: Ensure DisconnectReason remains parsable (#3766) * fix: NetworkAnimator initialization sequencing (#3767) * fix: NetworkAnimator initialization sequencing * Update changelog * fix: 2.7.0 test instabilities (#3768) * test - fix Resolving the PeerDisconnectCallbackTests instability where sometimes the disconnect notification is processed prior to the targeted client's NetworkManager having completely disconnected and shutdown (this would only have a chance of happening if server disconnects the client). Hoping to resolve the instability with the ParentingInSceneObjectsTests resulting in a false failure. * test fix Fixing potential cause for instabilities on this set of tests due to the initial network prefab transform settings not being applied to the prefab but applied to the spawned instances which could be causing issues since they were being applied to the non-authority instances. This fix moves the applied test NetworkTrransform settings to the player prefab prior to spawning any instances. --------- Co-authored-by: Emma <[email protected]>
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.
Purpose of this PR
Fix the fix for disconnect reason
Jira ticket
Changelog
Documentation
Testing & QA (How your changes can be verified during release Playtest)
Functional Testing
Manual testing :
Manual testing doneAutomated tests:
Covered by existing automated testsCovered by new automated testsDoes the change require QA team to:
Review automated tests?Execute manual tests?Provide feedback about the PR?If any boxes above are checked the QA team will be automatically added as a PR reviewer.
Backports