Clean up

Author: noellie-velez

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

@@ -976,19 +976,6 @@ public NetworkPrefabHandler PrefabHandler
         internal NetworkConnectionManager ConnectionManager = new NetworkConnectionManager();
         internal NetworkMessageManager MessageManager = null;
 
-        // internal struct Override<T>
-        // {
-        //     private T m_Value;
-        //     public bool Overidden { get; private set; }
-        //     internal T Value
-        //     {
-        //         get { return Overidden ? m_Value : default(T); }
-        //         set { Overidden = true; m_Value = value; }
-        //     }
-        // };
-        //
-        // internal Override<ushort> PortOverride;
-
         /// <summary>
         /// Determines if the NetworkManager's GameObject is parented under another GameObject and
         /// notifies the user that this is not allowed for the NetworkManager.
@@ -1168,8 +1155,6 @@ internal void Initialize(bool server)
                 return;
             }
 
-            //ParseCommandLineOptions();
-
             if (NetworkConfig.NetworkTransport == null)
             {
                 if (NetworkLog.CurrentLogLevel <= LogLevel.Error)
@@ -1740,40 +1725,6 @@ private void OnDestroy()
 #endif
         }
 
-//         // Command line options
-//         private const string k_OverridePortArg = "-port";
-//
-//         private string GetArg(string[] commandLineArgs, string arg)
-//         {
-//             var argIndex = Array.IndexOf(commandLineArgs, arg);
-//             if (argIndex >= 0 && argIndex < commandLineArgs.Length - 1)
-//             {
-//                 return commandLineArgs[argIndex + 1];
-//             }
-//
-//             return null;
-//         }
-//
-//         private void ParseArg<T>(string arg, ref Override<T> value)
-//         {
-//             if (GetArg(Environment.GetCommandLineArgs(), arg) is string argValue)
-//             {
-//                 value.Value = (T)Convert.ChangeType(argValue, typeof(T));
-//             }
-//         }
-//
-//         private void ParseCommandLineOptions()
-//         {
-// #if UNITY_SERVER && UNITY_DEDICATED_SERVER_ARGUMENTS_PRESENT
-//             if ( UnityEngine.DedicatedServer.Arguments.Port != null)
-//             {
-//                 PortOverride.Value = (ushort)UnityEngine.DedicatedServer.Arguments.Port;
-//             }
-// #else
-//             ParseArg(k_OverridePortArg, ref PortOverride);
-// #endif
-//         }
-
 #if UNITY_EDITOR
         internal static INetworkManagerHelper NetworkManagerHelper;
 

com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs

@@ -824,10 +824,10 @@ private void ParseCommandLineOptions()
         {
 #if UNITY_SERVER && UNITY_DEDICATED_SERVER_ARGUMENTS_PRESENT
 
-            Debug.Log("This is happening 1");
-            if ( UnityEngine.DedicatedServer.Arguments.Port != null)
+            Debug.Log("UNITY_DEDICATED_SERVER_ARGUMENTS_PRESENT");
+            if (UnityEngine.DedicatedServer.Arguments.Port != null)
             {
-                Debug.Log("This is happening 2");
+                Debug.Log("UnityEngine.DedicatedServer.Arguments.Port is not null");
                 PortOverride.Value = (ushort)UnityEngine.DedicatedServer.Arguments.Port;
             }
 #else
@@ -851,7 +851,7 @@ public void SetConnectionData(string ipv4Address, ushort port, string listenAddr
                     Debug.Log($"Already has command line option set. Using connection data set to {ipv4Address}:{port}");
                 }
 
-                ConnectionData.Port = port;
+                port = ConnectionData.Port;
             }
             else
             {

testproject/Packages/manifest.json

@@ -4,6 +4,7 @@
     "com.unity.addressables": "2.7.4",
     "com.unity.ai.navigation": "2.0.9",
     "com.unity.collab-proxy": "2.9.3",
+    "com.unity.dedicated-server": "1.6.1",
     "com.unity.ide.rider": "3.0.38",
     "com.unity.ide.visualstudio": "2.0.25",
     "com.unity.mathematics": "1.3.3",

testproject/Packages/packages-lock.json

@@ -55,6 +55,13 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.dedicated-server": {
+      "version": "1.6.1",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
     "com.unity.ext.nunit": {
       "version": "2.0.5",
       "depth": 1,