Skip to content

Commit 84f59f3

Browse files
committed
remove uninitialized from list instead of ignoring
1 parent 1425f56 commit 84f59f3

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefabs.cs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@ internal void Shutdown()
8181
{
8282
foreach (var list in NetworkPrefabsLists)
8383
{
84-
if (list == null)
85-
{
86-
continue;
87-
}
8884
list.OnAdd -= AddTriggeredByNetworkPrefabList;
8985
list.OnRemove -= RemoveTriggeredByNetworkPrefabList;
9086
}
@@ -98,12 +94,9 @@ internal void Shutdown()
9894
public void Initialize(bool warnInvalid = true)
9995
{
10096
m_Prefabs.Clear();
97+
NetworkPrefabsLists.RemoveAll(x => x == null);
10198
foreach (var list in NetworkPrefabsLists)
10299
{
103-
if (list == null)
104-
{
105-
continue;
106-
}
107100
list.OnAdd += AddTriggeredByNetworkPrefabList;
108101
list.OnRemove += RemoveTriggeredByNetworkPrefabList;
109102
}
@@ -117,10 +110,6 @@ public void Initialize(bool warnInvalid = true)
117110
{
118111
foreach (var list in NetworkPrefabsLists)
119112
{
120-
if (list == null)
121-
{
122-
continue;
123-
}
124113
prefabs.AddRange(list.PrefabList);
125114
}
126115
}

com.unity.netcode.gameobjects/Tests/Editor/NetworkManagerConfigurationTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,8 @@ public void WhenThereAreUninitializedElementsInPrefabsList_NoErrors()
303303

304304
networkConfig.InitializePrefabs();
305305

306-
Assert.IsTrue(networkConfig.Prefabs.NetworkPrefabsLists.Count == 1);
307-
Assert.IsTrue(networkConfig.Prefabs.NetworkPrefabsLists[0] == null);
306+
// Null elements will be removed from the list so it should be empty
307+
Assert.IsTrue(networkConfig.Prefabs.NetworkPrefabsLists.Count == 0);
308308
Assert.IsTrue(networkConfig.Prefabs.Prefabs.Count == 0);
309309

310310
networkConfig.Prefabs.Shutdown();

0 commit comments

Comments
 (0)