Skip to content

Commit a9b09fe

Browse files
committed
fix delegates lifetime: unsubscribe stale handlers on network despawn
CSync leaves stale change handlers after quitting the hosted game. When the host quits the game back to the main menu, ConfigSyncBehaviour despawns and gets destroyed by Unity (not by .NET GC), but any delegates connected to events in OnNetworkSpawn method remain and go stale. So next time a player hosts a lobby without shutting down and re-launching the game completely, when any of subscribed config files or config entries change, stale delegates execute and try to assign to a dead NetworkList _deltas[index]. Of course it results in an exception being logged to the console by BepInEx (which wraps event handler invocation in a try-catch). To fix this, store subscribed delegates, and properly unsubscribe them during despawn. Note that NetworkList and _syncEnabled variable can not be cleared/reset due to Unity issue which only got resolved in the most recent version. References: - https://learn.microsoft.com/en-us/dotnet/csharp/programming-guide/delegates/using-delegates - Unity-Technologies/com.unity.netcode.gameobjects#3502 Fixes lc-sigurd#13
1 parent 3ddfcca commit a9b09fe

1 file changed

Lines changed: 61 additions & 12 deletions

File tree

CSync/CSync/Lib/ConfigSyncBehaviour.cs

Lines changed: 61 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
using BepInEx.Configuration;
12
using System;
23
using System.Collections.Generic;
34
using System.Diagnostics.CodeAnalysis;
5+
using System.Linq;
46
using Unity.Netcode;
57
using UnityEngine;
68
using LogLevel = BepInEx.Logging.LogLevel;
@@ -36,7 +38,9 @@ public bool SyncEnabled
3638
}
3739

3840
private readonly NetworkVariable<bool> _syncEnabled = new();
39-
private NetworkList<SyncedEntryDelta> _deltas = null!;
41+
private readonly NetworkList<SyncedEntryDelta> _deltas = new();
42+
private readonly List<(ConfigFile, EventHandler<SettingChangedEventArgs>)> _settingChangedListeners = new();
43+
private readonly List<(SyncedEntryBase, EventHandler)> _entrySyncEnabledChangedListeners = new();
4044

4145
[MemberNotNull(nameof(EntryContainer))]
4246
private void EnsureEntryContainer()
@@ -48,7 +52,6 @@ private void EnsureEntryContainer()
4852
private void Awake()
4953
{
5054
EnsureEntryContainer();
51-
_deltas = new NetworkList<SyncedEntryDelta>();
5255
}
5356

5457
public override void OnNetworkSpawn()
@@ -59,28 +62,32 @@ public override void OnNetworkSpawn()
5962
{
6063
_syncEnabled.Value = true;
6164

65+
var index = 0;
6266
foreach (var syncedEntryBase in EntryContainer.Values)
6367
{
64-
var currentIndex = _deltas.Count;
6568
_deltas.Add(syncedEntryBase.ToDelta());
6669

67-
syncedEntryBase.BoxedEntry.ConfigFile.SettingChanged += (_, args) =>
70+
void onSettingChanged(object sender, SettingChangedEventArgs args)
6871
{
6972
if (!ReferenceEquals(syncedEntryBase.BoxedEntry, args.ChangedSetting)) return;
70-
_deltas[currentIndex] = syncedEntryBase.ToDelta();
71-
};
73+
_deltas[index] = syncedEntryBase.ToDelta();
74+
}
75+
var configFile = syncedEntryBase.BoxedEntry.ConfigFile;
76+
configFile.SettingChanged += onSettingChanged;
77+
_settingChangedListeners.Add((configFile, onSettingChanged));
7278

73-
syncedEntryBase.SyncEnabledChanged += (_, args) =>
79+
void onEntrySyncEnabledChanged(object sender, EventArgs args)
7480
{
75-
_deltas[currentIndex] = syncedEntryBase.ToDelta();
76-
};
81+
_deltas[index] = syncedEntryBase.ToDelta();
82+
}
83+
syncedEntryBase.SyncEnabledChanged += onEntrySyncEnabledChanged;
84+
_entrySyncEnabledChangedListeners.Add((syncedEntryBase, onEntrySyncEnabledChanged));
85+
index++;
7786
}
7887

7988
InitialSyncCompletedHandler?.Invoke(this, EventArgs.Empty);
80-
return;
8189
}
82-
83-
if (IsClient)
90+
else if (IsClient)
8491
{
8592
_syncEnabled.OnValueChanged += OnSyncEnabledChanged;
8693
_deltas.OnListChanged += OnClientDeltaListChanged;
@@ -94,6 +101,48 @@ public override void OnNetworkSpawn()
94101

95102
InitialSyncCompletedHandler?.Invoke(this, EventArgs.Empty);
96103
}
104+
105+
base.OnNetworkSpawn();
106+
}
107+
108+
public override void OnNetworkDespawn()
109+
{
110+
EnsureEntryContainer();
111+
112+
if (IsServer)
113+
{
114+
foreach (var (configFile, onSettingChanged) in _settingChangedListeners)
115+
{
116+
configFile.SettingChanged -= onSettingChanged;
117+
}
118+
119+
foreach (var (syncedEntryBase, onEntrySyncEnabledChanged) in _entrySyncEnabledChangedListeners)
120+
{
121+
syncedEntryBase.SyncEnabledChanged -= onEntrySyncEnabledChanged;
122+
}
123+
124+
_settingChangedListeners.Clear();
125+
_entrySyncEnabledChangedListeners.Clear();
126+
// NetworkList and NetworkVariable can not be modified now because the network manager has already shut down.
127+
// See https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/pull/3502
128+
// Should not be needed anyway, since this component isn't being reused between network sessions.
129+
// _deltas.Clear();
130+
// _syncEnabled.Value = false;
131+
}
132+
else if (IsClient)
133+
{
134+
DisableOverrides();
135+
136+
foreach (var delta in _deltas)
137+
{
138+
ResetOverrideValue(delta);
139+
}
140+
141+
_deltas.OnListChanged -= OnClientDeltaListChanged;
142+
_syncEnabled.OnValueChanged -= OnSyncEnabledChanged;
143+
}
144+
145+
base.OnNetworkDespawn();
97146
}
98147

99148
public override void OnDestroy()

0 commit comments

Comments
 (0)