Merge branch 'fix/v2.x/add-flag-dedicated-server-override' of github.com:Unity-Technologies/com.unity.netcode.gameobjects into fix/v2.x/add-flag-dedicated-server-override

noellie-velez · noellie-velez · commit 9d26b39f0a15 · 2025-11-17T18:46:59.000+01:00
diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs
@@ -854,7 +854,7 @@ public void SetConnectionData(string ipv4Address, ushort port, string listenAddr
                 port = commandLinePort;
             }
 
-            if (ParseCommandLineOptionsAddress(out var commandLineIp))
+            if (!forceOverrideCommandLineArgs && ParseCommandLineOptionsAddress(out var commandLineIp))
             {
                 ipv4Address = commandLineIp;
             }

Original file line number	Diff line number	Diff line change
`@@ -854,7 +854,7 @@ public void SetConnectionData(string ipv4Address, ushort port, string listenAddr`
`854`	`854`	`port = commandLinePort;`
`855`	`855`	`}`
`856`	`856`
`857`		`- if (ParseCommandLineOptionsAddress(out var commandLineIp))`
	`857`	`+ if (!forceOverrideCommandLineArgs && ParseCommandLineOptionsAddress(out var commandLineIp))`
`858`	`858`	`{`
`859`	`859`	`ipv4Address = commandLineIp;`
`860`	`860`	`}`