Merge branch 'develop-2.0.0' into fix/networktransform-autoswitchspace-forcing-updates-localspace

Author: NoelStephensUnity

.yamato/package-pack.yml

@@ -47,4 +47,4 @@ package_pack_-_ngo_{{ platform.name }}:
     packages:
       paths:
         - "upm-ci~/**"
-{% endfor -%}
+{% endfor -%}

.yamato/vetting-test.yml

@@ -10,7 +10,6 @@ vetting_test:
   name: MP Tools - Vetting Test (Win, {{editor}} LTS)
   agent: { type: Unity::VM, flavor: b1.large, image: package-ci/win11:v4 }
   commands:
-    - python Tools/scripts/release.py # Needed to ensure that CHANGELOG is properly formatted for this test
     - npm install -g "upm-ci-utils@stable" --registry https://artifactory.prd.it.unity3d.com/artifactory/api/npm/upm-npm
     - unity-downloader-cli --fast --wait --unity-version {{ editor }} --components editor --arch x64
     - upm-ci package pack --package-path com.unity.netcode.gameobjects
@@ -22,4 +21,4 @@ vetting_test:
         - test-results/**
         - upm-ci~/test-results/**
         - upm-ci~/upm-ci.log
-{% endfor -%}
+{% endfor -%}

com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs

@@ -785,13 +785,13 @@ public OwnershipRequestStatus RequestOwnership()
             // Otherwise, send the request ownership message
             var changeOwnership = new ChangeOwnershipMessage
             {
+                ChangeMessageType = ChangeOwnershipMessage.ChangeType.RequestOwnership,
                 NetworkObjectId = NetworkObjectId,
                 OwnerClientId = OwnerClientId,
                 ClientIdCount = 1,
                 RequestClientId = NetworkManager.LocalClientId,
                 ClientIds = new ulong[1] { OwnerClientId },
                 DistributedAuthorityMode = true,
-                RequestOwnership = true,
                 OwnershipFlags = (ushort)Ownership,
             };
 
@@ -866,18 +866,18 @@ internal void OwnershipRequest(ulong clientRequestingOwnership)
             else
             {
                 // Otherwise, send back the reason why the ownership request was denied for the clientRequestingOwnership
-                /// Notes:
-                /// We always apply the <see cref="NetworkManager.LocalClientId"/> as opposed to <see cref="OwnerClientId"/> to the
-                /// <see cref="ChangeOwnershipMessage.OwnerClientId"/> value as ownership could have changed and the denied requests
-                /// targeting this instance are because there is a request pending.
-                /// DANGO-TODO: What happens if the client requesting disconnects prior to responding with the update in request pending?
+                // Notes:
+                // We always apply the <see cref="NetworkManager.LocalClientId"/> as opposed to <see cref="OwnerClientId"/> to the
+                // <see cref="ChangeOwnershipMessage.OwnerClientId"/> value as ownership could have changed and the denied requests
+                // targeting this instance are because there is a request pending.
+                // DANGO-TODO: What happens if the client requesting disconnects prior to responding with the update in request pending?
                 var changeOwnership = new ChangeOwnershipMessage
                 {
+                    ChangeMessageType = ChangeOwnershipMessage.ChangeType.RequestDenied,
                     NetworkObjectId = NetworkObjectId,
                     OwnerClientId = NetworkManager.LocalClientId, // Always use the local clientId (see above notes)
                     RequestClientId = clientRequestingOwnership,
                     DistributedAuthorityMode = true,
-                    RequestDenied = true,
                     OwnershipRequestResponseStatus = (byte)response,
                     OwnershipFlags = (ushort)Ownership,
                 };
@@ -1063,10 +1063,10 @@ internal void SendOwnershipStatusUpdate()
 
             var changeOwnership = new ChangeOwnershipMessage
             {
+                ChangeMessageType = ChangeOwnershipMessage.ChangeType.OwnershipFlagsUpdate,
                 NetworkObjectId = NetworkObjectId,
                 OwnerClientId = OwnerClientId,
                 DistributedAuthorityMode = true,
-                OwnershipFlagsUpdate = true,
                 OwnershipFlags = (ushort)Ownership,
             };