rename and partially revert Awake

Author: ratijas

CSync/CSync/Lib/ConfigSyncBehaviour.cs

@@ -39,8 +39,8 @@ public bool SyncEnabled
 
     private readonly NetworkVariable<bool> _syncEnabled = new();
     private readonly NetworkList<SyncedEntryDelta> _deltas = new();
-    private readonly List<(ConfigFile, EventHandler<SettingChangedEventArgs>)> _configFileDelegates = new();
-    private readonly List<(SyncedEntryBase, EventHandler)> _entrySyncEnabledDelegates = new();
+    private readonly List<(ConfigFile, EventHandler<SettingChangedEventArgs>)> _settingChangedListeners = new();
+    private readonly List<(SyncedEntryBase, EventHandler)> _entrySyncEnabledChangedListeners = new();
 
     [MemberNotNull(nameof(EntryContainer))]
     private void EnsureEntryContainer()
@@ -49,6 +49,11 @@ private void EnsureEntryContainer()
         throw new InvalidOperationException("Entry container has not been assigned.");
     }
 
+    private void Awake()
+    {
+        EnsureEntryContainer();
+    }
+
     public override void OnNetworkSpawn()
     {
         EnsureEntryContainer();
@@ -57,7 +62,8 @@ public override void OnNetworkSpawn()
         {
             _syncEnabled.Value = true;
 
-            foreach (var (syncedEntryBase, index) in EntryContainer.Values.Select((e, i) => (e, i)))
+            var index = 0;
+            foreach (var syncedEntryBase in EntryContainer.Values)
             {
                 _deltas.Add(syncedEntryBase.ToDelta());
 
@@ -68,14 +74,15 @@ void configFileDelegate(object sender, SettingChangedEventArgs args)
                 }
                 var configFile = syncedEntryBase.BoxedEntry.ConfigFile;
                 configFile.SettingChanged += configFileDelegate;
-                _configFileDelegates.Add((configFile, configFileDelegate));
+                _settingChangedListeners.Add((configFile, configFileDelegate));
 
                 void entrySyncEnabledDelegate(object sender, EventArgs args)
                 {
                     _deltas[index] = syncedEntryBase.ToDelta();
                 }
                 syncedEntryBase.SyncEnabledChanged += entrySyncEnabledDelegate;
-                _entrySyncEnabledDelegates.Add((syncedEntryBase, entrySyncEnabledDelegate));
+                _entrySyncEnabledChangedListeners.Add((syncedEntryBase, entrySyncEnabledDelegate));
+                index++;
             }
 
             InitialSyncCompletedHandler?.Invoke(this, EventArgs.Empty);
@@ -104,18 +111,18 @@ public override void OnNetworkDespawn()
 
         if (IsServer)
         {
-            foreach (var (configFile, configFileDelegate) in _configFileDelegates)
+            foreach (var (configFile, configFileDelegate) in _settingChangedListeners)
             {
                 configFile.SettingChanged -= configFileDelegate;
             }
 
-            foreach (var (syncedEntryBase, entrySyncEnabledDelegate) in _entrySyncEnabledDelegates)
+            foreach (var (syncedEntryBase, entrySyncEnabledDelegate) in _entrySyncEnabledChangedListeners)
             {
                 syncedEntryBase.SyncEnabledChanged -= entrySyncEnabledDelegate;
             }
 
-            _configFileDelegates.Clear();
-            _entrySyncEnabledDelegates.Clear();
+            _settingChangedListeners.Clear();
+            _entrySyncEnabledChangedListeners.Clear();
             // NetworkList and NetworkVariable can not be modified now because the network manager has already shut down.
             // See https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/pull/3502
             // Should not be needed anyway, since this component isn't being reused between network sessions.