fix - merge

NoelStephensUnity · NoelStephensUnity · commit 34a9aedebb21 · 2025-10-15T14:55:05.000-05:00
Fixing merge issue.
diff --git a/com.unity.netcode.gameobjects/Runtime/Connection/NetworkConnectionManager.cs b/com.unity.netcode.gameobjects/Runtime/Connection/NetworkConnectionManager.cs
@@ -1440,7 +1440,12 @@ internal void DisconnectClient(ulong clientId, string reason = null)
             }
 
             Transport.ClosingRemoteConnection();
-            GenerateDisconnectInformation(clientId, ClientIdToTransportId(clientId), reason);
+            var transportId = ClientIdToTransportId(clientId);
+            if (transportId.Item2)
+            {
+                GenerateDisconnectInformation(clientId, transportId.Item1, reason);
+            }
+
             HandleConnectionDisconnect(clientId, reason);
         }
 
@@ -1487,7 +1492,7 @@ internal void Shutdown()
                 Transport.ShuttingDown();
                 var clientId = NetworkManager ? NetworkManager.LocalClientId : NetworkManager.ServerClientId;
                 var transportId = ClientIdToTransportId(clientId);
-                GenerateDisconnectInformation(clientId, transportId, $"{nameof(NetworkConnectionManager)} was shutdown.");
+                GenerateDisconnectInformation(clientId, transportId.Item1, $"{nameof(NetworkConnectionManager)} was shutdown.");
             }
 
             if (LocalClient.IsServer)

Original file line number	Diff line number	Diff line change
`@@ -1440,7 +1440,12 @@ internal void DisconnectClient(ulong clientId, string reason = null)`
`1440`	`1440`	`}`
`1441`	`1441`
`1442`	`1442`	`Transport.ClosingRemoteConnection();`
`1443`		`- GenerateDisconnectInformation(clientId, ClientIdToTransportId(clientId), reason);`
	`1443`	`+ var transportId = ClientIdToTransportId(clientId);`
	`1444`	`+ if (transportId.Item2)`
	`1445`	`+ {`
	`1446`	`+ GenerateDisconnectInformation(clientId, transportId.Item1, reason);`
	`1447`	`+ }`
	`1448`	`+`
`1444`	`1449`	`HandleConnectionDisconnect(clientId, reason);`
`1445`	`1450`	`}`
`1446`	`1451`
`@@ -1487,7 +1492,7 @@ internal void Shutdown()`
`1487`	`1492`	`Transport.ShuttingDown();`
`1488`	`1493`	`var clientId = NetworkManager ? NetworkManager.LocalClientId : NetworkManager.ServerClientId;`
`1489`	`1494`	`var transportId = ClientIdToTransportId(clientId);`
`1490`		`- GenerateDisconnectInformation(clientId, transportId, $"{nameof(NetworkConnectionManager)} was shutdown.");`
	`1495`	`+ GenerateDisconnectInformation(clientId, transportId.Item1, $"{nameof(NetworkConnectionManager)} was shutdown.");`
`1491`	`1496`	`}`
`1492`	`1497`
`1493`	`1498`	`if (LocalClient.IsServer)`