Fix tests

Author: EmandM

com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ChangeOwnershipMessage.cs

@@ -56,6 +56,8 @@ public void Serialize(FastBufferWriter writer, int targetVersion)
                     }
                 }
 
+                writer.WriteValueSafe(ChangeMessageType);
+
                 if (ChangeMessageType == ChangeType.OwnershipFlagsUpdate || ChangeMessageType == ChangeType.OwnershipChanging || ChangeMessageType == ChangeType.RequestApproved)
                 {
                     writer.WriteValueSafe(OwnershipFlags);
@@ -155,7 +157,7 @@ public void Handle(ref NetworkContext context)
             // If ownership is changing (either a straight change or a request approval), then run through the ownership changed sequence
             // Note: There is some extended ownership script at the bottom of HandleOwnershipChange
             // If not in distributed authority mode, ChangeMessageType will always be OwnershipChanging.
-            if (ChangeMessageType == ChangeType.OwnershipChanging || ChangeMessageType == ChangeType.RequestApproved)
+            if (ChangeMessageType == ChangeType.OwnershipChanging || ChangeMessageType == ChangeType.RequestApproved || !networkManager.DistributedAuthorityMode)
             {
                 HandleOwnershipChange(ref context);
             }
@@ -312,7 +314,8 @@ private bool HandleDAHostMessageForwarding(ref NetworkManager networkManager, ul
                 {
                     message.OwnershipRequestResponseStatus = OwnershipRequestResponseStatus;
                     networkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.Reliable, RequestClientId);
-                    // We don't want the local DAHost's client to process this message, so exit early
+
+                    // We don't want the local DAHost's client to process this message
                     return false;
                 }
             }
@@ -322,31 +325,21 @@ private bool HandleDAHostMessageForwarding(ref NetworkManager networkManager, ul
                 if (OwnerClientId != networkManager.LocalClientId)
                 {
                     networkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.Reliable, OwnerClientId);
-                    // We don't want the local DAHost's client to process this message, so exit early
+
+                    // We don't want the local DAHost's client to process this message
                     return false;
                 }
-                // Otherwise, fall through and process the request.
             }
             else
             {
                 foreach (var clientId in clientList)
                 {
-                    if (clientId == networkManager.LocalClientId)
+                    // Don't forward to self or originating client
+                    if (clientId == networkManager.LocalClientId || clientId == senderId)
                     {
                         continue;
                     }
 
-                    switch (ChangeMessageType)
-                    {
-                        // If ownership is changing and this is not an ownership request approval then ignore the SenderId
-                        case ChangeType.OwnershipChanging when senderId == clientId:
-                        // If it is just updating flags then ignore sending to the owner
-                        case ChangeType.OwnershipFlagsUpdate when clientId == OwnerClientId:
-                        // If it is a request approval, then ignore the RequestClientId
-                        case ChangeType.RequestApproved when clientId == RequestClientId:
-                            continue;
-                    }
-
                     networkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.Reliable, clientId);
                 }
             }

com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs

@@ -575,12 +575,12 @@ internal void ChangeOwnership(NetworkObject networkObject, ulong clientId, bool
                     ChangeMessageType = isRequestApproval ? ChangeOwnershipMessage.ChangeType.RequestApproved : ChangeOwnershipMessage.ChangeType.OwnershipChanging,
                     NetworkObjectId = networkObject.NetworkObjectId,
                     OwnerClientId = networkObject.OwnerClientId,
-                    DistributedAuthorityMode = NetworkManager.DistributedAuthorityMode,
+                    DistributedAuthorityMode = true,
                     RequestClientId = networkObject.PreviousOwnerId,
                     OwnershipFlags = (ushort)networkObject.Ownership,
                 };
-                // If we are connected to the CMB service or not the DAHost (i.e. pure DA-Clients only)
 
+                // If we are connected to the CMB service or not the DAHost (i.e. pure DA-Clients only)
                 if (NetworkManager.CMBServiceConnection || !NetworkManager.DAHost)
                 {
                     // Always update the network properties in distributed authority mode for the client gaining ownership

com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/OwnershipPermissionsTests.cs

@@ -17,6 +17,12 @@ internal class OwnershipPermissionsTests : IntegrationTestWithApproximation
 
         protected override int NumberOfClients => 4;
 
+        // TODO: [CmbServiceTests] Remove this once MTTB-1570 is resolved.
+        protected override bool UseCMBService()
+        {
+            return false;
+        }
+
         public OwnershipPermissionsTests() : base(HostOrServer.DAHost)
         {
         }

com.unity.netcode.gameobjects/Tests/Runtime/TestHelpers/NetcodeIntegrationTestHelpers.cs

@@ -197,7 +197,7 @@ internal static string GetCMBServiceEnvironentVariable()
 #if USE_CMB_SERVICE
             return "true";
 #else
-            return Environment.GetEnvironmentVariable("USE_CMB_SERVICE") ?? "true";
+            return Environment.GetEnvironmentVariable("USE_CMB_SERVICE") ?? "false";
 #endif
         }