Apply suggestions from code review

NoelStephensUnity · EmandM · web-flow · commit 65c25a194e59 · 2026-05-29T14:44:00.000-05:00
Co-authored-by: Emma &lt;emma.mcmillan@unity3d.com&gt;
diff --git a/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefabs.cs b/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefabs.cs
@@ -142,20 +142,14 @@ public void Initialize(bool warnInvalid = true)
                 {
                     m_Prefabs.Add(networkPrefab);
 #if UNIFIED_NETCODE && UNIFIED_NGO_REGISTERS_PREFABS
-                    if (!PrefabTable.ContainsKey(networkPrefab.SourcePrefabGlobalObjectIdHash))
-                    {
-                        PrefabTable.Add(networkPrefab.SourcePrefabGlobalObjectIdHash, networkPrefab);
-                    }
+                    PrefabTable.TryAdd(networkPrefab.SourcePrefabGlobalObjectIdHash, networkPrefab);
 #endif
                 }
                 else
                 {
                     removeList?.Add(networkPrefab);
 #if UNIFIED_NETCODE && UNIFIED_NGO_REGISTERS_PREFABS
-                    if (PrefabTable.ContainsKey(networkPrefab.SourcePrefabGlobalObjectIdHash))
-                    {
-                        PrefabTable.Remove(networkPrefab.SourcePrefabGlobalObjectIdHash);
-                    }
+                    PrefabTable.Remove(networkPrefab.SourcePrefabGlobalObjectIdHash);
 #endif
                 }
             }
@@ -166,20 +160,14 @@ public void Initialize(bool warnInvalid = true)
                 {
                     m_Prefabs.Add(networkPrefab);
 #if UNIFIED_NETCODE && UNIFIED_NGO_REGISTERS_PREFABS
-                    if (!PrefabTable.ContainsKey(networkPrefab.SourcePrefabGlobalObjectIdHash))
-                    {
-                        PrefabTable.Add(networkPrefab.SourcePrefabGlobalObjectIdHash, networkPrefab);
-                    }
+                    PrefabTable.TryAdd(networkPrefab.SourcePrefabGlobalObjectIdHash, networkPrefab);
 #endif
                 }
                 else
                 {
                     removeList?.Add(networkPrefab);
 #if UNIFIED_NETCODE && UNIFIED_NGO_REGISTERS_PREFABS
-                    if (PrefabTable.ContainsKey(networkPrefab.SourcePrefabGlobalObjectIdHash))
-                    {
-                        PrefabTable.Remove(networkPrefab.SourcePrefabGlobalObjectIdHash);
-                    }
+                    PrefabTable.Remove(networkPrefab.SourcePrefabGlobalObjectIdHash);
 #endif
                 }
             }
@@ -214,10 +202,7 @@ public bool Add(NetworkPrefab networkPrefab)
                 m_Prefabs.Add(networkPrefab);
                 m_RuntimeAddedPrefabs.Add(networkPrefab);
 #if UNIFIED_NETCODE && UNIFIED_NGO_REGISTERS_PREFABS
-                if (!PrefabTable.ContainsKey(networkPrefab.SourcePrefabGlobalObjectIdHash))
-                {
-                    PrefabTable.Add(networkPrefab.SourcePrefabGlobalObjectIdHash, networkPrefab);
-                }
+                PrefabTable.TryAdd(networkPrefab.SourcePrefabGlobalObjectIdHash, networkPrefab);
 #endif
                 return true;
             }
@@ -247,10 +232,7 @@ public void Remove(NetworkPrefab prefab)
             OverrideToNetworkPrefab.Remove(prefab.TargetPrefabGlobalObjectIdHash);
             NetworkPrefabOverrideLinks.Remove(prefab.SourcePrefabGlobalObjectIdHash);
 #if UNIFIED_NETCODE && UNIFIED_NGO_REGISTERS_PREFABS
-            if (PrefabTable.ContainsKey(prefab.SourcePrefabGlobalObjectIdHash))
-            {
-                PrefabTable.Remove(prefab.SourcePrefabGlobalObjectIdHash);
-            }
+            PrefabTable.Remove(prefab.SourcePrefabGlobalObjectIdHash);
 #endif
         }
 
@@ -401,7 +383,7 @@ private bool AddPrefabRegistration(NetworkPrefab networkPrefab)
 
 #if UNIFIED_NGO_REGISTERS_PREFABS
                 HasPendingGhostPrefabs = true;
-                m_PendingGhostRegistration.Add(networkPrefab);
+                m_PendingGhostRegistration.TryAdd(networkPrefab);
 #endif
             }
 #endif
diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs
@@ -1375,7 +1375,7 @@ internal void InitializeNetcodeWorld()
             {
                 if (NetCode.Netcode.IsActive)
                 {
-                    NetworkLog.LogInfo($"[{nameof(InitializeNetcodeWorld)}] Netcode is not active but has an instance at this point.");
+                    Log.Info(new Context(LogLevel.Normal, "Netcode is not active but has an instance at this point."));
                 }
                 /// !! Important !!
                 /// Clear out any pre-existing configuration in the event this applicatioin instance has already been connected to a session.
@@ -1396,12 +1396,12 @@ private bool UnifiedIsConfiguredCorrectly()
         {
             if (NetCodeConfig.Global == null)
             {
-                Debug.LogError($"[{nameof(NetworkManager)}][Unified] You must create a {nameof(NetCodeConfig)} and set it to a single world in order to run in hybrid mode!");
+                Log.Error(new Context(LogLevel.Error, "You must create a {nameof(NetCodeConfig)} and set it to a single world in order to run in hybrid mode!").AddTag("Unified"));
                 return false;
             }
             if (NetCodeConfig.Global.HostWorldModeSelection != NetCodeConfig.HostWorldMode.SingleWorld)
             {
-                Debug.LogError($"[{nameof(NetworkManager)}][Unified] You must configure {nameof(NetCodeConfig)} to only use a single world in order to run in hybrid mode!");
+                Log.Error(new Context(LogLevel.Error, "You must configure {nameof(NetCodeConfig)} to only use a single world in order to run in hybrid mode!").AddTag("Unified"));
                 return false;
             }
             return true;
@@ -1451,18 +1451,12 @@ public bool StartServer()
                 }
                 if (LogLevel <= LogLevel.Developer)
                 {
-                    Debug.Log("Creating world: Default world");
+                    Log.Info(new Context(LogLevel.Developer, "Creating world: Default world"));
                 }
                 InitializeNetcodeWorld();
-                return InternalStartServer();
             }
-            else
-            {
-                return InternalStartServer();
-            }
-#else
-            return InternalStartServer();
 #endif
+            return InternalStartServer();
         }
 
         internal bool InternalStartServer()
@@ -1534,21 +1528,11 @@ public bool StartClient()
                     ShutdownInternal();
                     return false;
                 }
-                if (LogLevel <= LogLevel.Developer)
-                {
-                    Debug.Log("Creating world: Default world");
-                }
+                Log.Info(new Context(LogLevel.Developer, "Creating world: Default world"));
                 InitializeNetcodeWorld();
-                return InternalStartClient();
-            }
-            else
-            {
-                return InternalStartClient();
             }
-#else
-            return InternalStartClient();
 #endif
-
+            return InternalStartClient();
         }
 
         internal bool InternalStartClient()
@@ -1618,21 +1602,11 @@ public bool StartHost()
                     ShutdownInternal();
                     return false;
                 }
-                if (LogLevel <= LogLevel.Developer)
-                {
-                    Debug.Log("Creating world: Default world");
-                }
+                Log.Info(new Context(LogLevel.Developer, "Creating world: Default world"));
                 InitializeNetcodeWorld();
-                return InternalStartHost();
             }
-            else
-            {
-                return InternalStartHost();
-            }
-#else
-            return InternalStartHost();
 #endif
-
+            return InternalStartHost();
         }
 
         internal bool InternalStartHost()
@@ -1859,7 +1833,7 @@ internal void ShutdownInternal()
                 }
                 catch (Exception ex)
                 {
-                    Debug.LogException(ex);
+                    Log.Exception(ex);
                 }
             }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1375,7 +1375,7 @@ internal void InitializeNetcodeWorld()`
`1375`	`1375`	`{`
`1376`	`1376`	`if (NetCode.Netcode.IsActive)`
`1377`	`1377`	`{`
`1378`		`- NetworkLog.LogInfo($"[{nameof(InitializeNetcodeWorld)}] Netcode is not active but has an instance at this point.");`
	`1378`	`+ Log.Info(new Context(LogLevel.Normal, "Netcode is not active but has an instance at this point."));`
`1379`	`1379`	`}`
`1380`	`1380`	`/// !! Important !!`
`1381`	`1381`	`/// Clear out any pre-existing configuration in the event this applicatioin instance has already been connected to a session.`
`@@ -1396,12 +1396,12 @@ private bool UnifiedIsConfiguredCorrectly()`
`1396`	`1396`	`{`
`1397`	`1397`	`if (NetCodeConfig.Global == null)`
`1398`	`1398`	`{`
`1399`		`- Debug.LogError($"[{nameof(NetworkManager)}][Unified] You must create a {nameof(NetCodeConfig)} and set it to a single world in order to run in hybrid mode!");`
	`1399`	`+ Log.Error(new Context(LogLevel.Error, "You must create a {nameof(NetCodeConfig)} and set it to a single world in order to run in hybrid mode!").AddTag("Unified"));`
`1400`	`1400`	`return false;`
`1401`	`1401`	`}`
`1402`	`1402`	`if (NetCodeConfig.Global.HostWorldModeSelection != NetCodeConfig.HostWorldMode.SingleWorld)`
`1403`	`1403`	`{`
`1404`		`- Debug.LogError($"[{nameof(NetworkManager)}][Unified] You must configure {nameof(NetCodeConfig)} to only use a single world in order to run in hybrid mode!");`
	`1404`	`+ Log.Error(new Context(LogLevel.Error, "You must configure {nameof(NetCodeConfig)} to only use a single world in order to run in hybrid mode!").AddTag("Unified"));`
`1405`	`1405`	`return false;`
`1406`	`1406`	`}`
`1407`	`1407`	`return true;`
`@@ -1451,18 +1451,12 @@ public bool StartServer()`
`1451`	`1451`	`}`
`1452`	`1452`	`if (LogLevel <= LogLevel.Developer)`
`1453`	`1453`	`{`
`1454`		`- Debug.Log("Creating world: Default world");`
	`1454`	`+ Log.Info(new Context(LogLevel.Developer, "Creating world: Default world"));`
`1455`	`1455`	`}`
`1456`	`1456`	`InitializeNetcodeWorld();`
`1457`		`- return InternalStartServer();`
`1458`	`1457`	`}`
`1459`		`- else`
`1460`		`- {`
`1461`		`- return InternalStartServer();`
`1462`		`- }`
`1463`		`-#else`
`1464`		`- return InternalStartServer();`
`1465`	`1458`	`#endif`
	`1459`	`+ return InternalStartServer();`
`1466`	`1460`	`}`
`1467`	`1461`
`1468`	`1462`	`internal bool InternalStartServer()`
`@@ -1534,21 +1528,11 @@ public bool StartClient()`
`1534`	`1528`	`ShutdownInternal();`
`1535`	`1529`	`return false;`
`1536`	`1530`	`}`
`1537`		`- if (LogLevel <= LogLevel.Developer)`
`1538`		`- {`
`1539`		`- Debug.Log("Creating world: Default world");`
`1540`		`- }`
	`1531`	`+ Log.Info(new Context(LogLevel.Developer, "Creating world: Default world"));`
`1541`	`1532`	`InitializeNetcodeWorld();`
`1542`		`- return InternalStartClient();`
`1543`		`- }`
`1544`		`- else`
`1545`		`- {`
`1546`		`- return InternalStartClient();`
`1547`	`1533`	`}`
`1548`		`-#else`
`1549`		`- return InternalStartClient();`
`1550`	`1534`	`#endif`
`1551`		`-`
	`1535`	`+ return InternalStartClient();`
`1552`	`1536`	`}`
`1553`	`1537`
`1554`	`1538`	`internal bool InternalStartClient()`
`@@ -1618,21 +1602,11 @@ public bool StartHost()`
`1618`	`1602`	`ShutdownInternal();`
`1619`	`1603`	`return false;`
`1620`	`1604`	`}`
`1621`		`- if (LogLevel <= LogLevel.Developer)`
`1622`		`- {`
`1623`		`- Debug.Log("Creating world: Default world");`
`1624`		`- }`
	`1605`	`+ Log.Info(new Context(LogLevel.Developer, "Creating world: Default world"));`
`1625`	`1606`	`InitializeNetcodeWorld();`
`1626`		`- return InternalStartHost();`
`1627`	`1607`	`}`
`1628`		`- else`
`1629`		`- {`
`1630`		`- return InternalStartHost();`
`1631`		`- }`
`1632`		`-#else`
`1633`		`- return InternalStartHost();`
`1634`	`1608`	`#endif`
`1635`		`-`
	`1609`	`+ return InternalStartHost();`
`1636`	`1610`	`}`
`1637`	`1611`
`1638`	`1612`	`internal bool InternalStartHost()`
`@@ -1859,7 +1833,7 @@ internal void ShutdownInternal()`
`1859`	`1833`	`}`
`1860`	`1834`	`catch (Exception ex)`
`1861`	`1835`	`{`
`1862`		`- Debug.LogException(ex);`
	`1836`	`+ Log.Exception(ex);`
`1863`	`1837`	`}`
`1864`	`1838`	`}`
`1865`	`1839`	`#endif`