From 069ec446cdbf2dd4df5b22e407472947b656ad8c Mon Sep 17 00:00:00 2001 From: miniduikboot Date: Thu, 26 Mar 2026 23:58:45 +0100 Subject: [PATCH 1/2] Switch to concurrent dictionary PR proposed in #722 doesn't solve all issues, now Nullrefs show up. Also drop _allObjects as it's never read. --- src/Impostor.Server/Net/State/Game.Data.cs | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/src/Impostor.Server/Net/State/Game.Data.cs b/src/Impostor.Server/Net/State/Game.Data.cs index dcd57e0b..73c6ba0e 100644 --- a/src/Impostor.Server/Net/State/Game.Data.cs +++ b/src/Impostor.Server/Net/State/Game.Data.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -60,9 +61,7 @@ namespace Impostor.Server.Net.State private static readonly Dictionary SpawnableObjectIds = SpawnableObjects.ToDictionary((i) => i.Value, (i) => i.Key); - private readonly List _allObjects = new List(); - - private readonly Dictionary _allObjectsFast = new Dictionary(); + private readonly ConcurrentDictionary _allObjectsFast = new ConcurrentDictionary(); private uint _nextNetId = MinServerNetId; @@ -533,25 +532,12 @@ namespace Impostor.Server.Net.State private bool AddNetObject(InnerNetObject obj) { - if (_allObjectsFast.ContainsKey(obj.NetId)) - { - return false; - } - - _allObjects.Add(obj); - _allObjectsFast.Add(obj.NetId, obj); - return true; + return _allObjectsFast.TryAdd(obj.NetId, obj); } private void RemoveNetObject(InnerNetObject obj) { - var index = _allObjects.IndexOf(obj); - if (index > -1) - { - _allObjects.RemoveAt(index); - } - - _allObjectsFast.Remove(obj.NetId); + _allObjectsFast.TryRemove(obj.NetId, out _); } } } From 4244f39640c826231f84e284a9311083c772c40f Mon Sep 17 00:00:00 2001 From: miniduikboot Date: Fri, 27 Mar 2026 23:32:57 +0100 Subject: [PATCH 2/2] Rename _allObjectsFast to _allObjects Done because there is no second datastructure anymore --- src/Impostor.Server/Net/State/Game.Data.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Impostor.Server/Net/State/Game.Data.cs b/src/Impostor.Server/Net/State/Game.Data.cs index 73c6ba0e..ad63380c 100644 --- a/src/Impostor.Server/Net/State/Game.Data.cs +++ b/src/Impostor.Server/Net/State/Game.Data.cs @@ -61,14 +61,14 @@ namespace Impostor.Server.Net.State private static readonly Dictionary SpawnableObjectIds = SpawnableObjects.ToDictionary((i) => i.Value, (i) => i.Key); - private readonly ConcurrentDictionary _allObjectsFast = new ConcurrentDictionary(); + private readonly ConcurrentDictionary _allObjects = new ConcurrentDictionary(); private uint _nextNetId = MinServerNetId; public T? FindObjectByNetId(uint netId) where T : IInnerNetObject { - if (_allObjectsFast.TryGetValue(netId, out var obj)) + if (_allObjects.TryGetValue(netId, out var obj)) { return (T)(IInnerNetObject)obj; } @@ -103,7 +103,7 @@ namespace Impostor.Server.Net.State case GameDataTag.DataFlag: { var netId = reader.ReadPackedUInt32(); - if (_allObjectsFast.TryGetValue(netId, out var obj)) + if (_allObjects.TryGetValue(netId, out var obj)) { await obj.DeserializeAsync(sender, target, reader, false); } @@ -118,7 +118,7 @@ namespace Impostor.Server.Net.State case GameDataTag.RpcFlag: { var netId = reader.ReadPackedUInt32(); - if (_allObjectsFast.TryGetValue(netId, out var obj)) + if (_allObjects.TryGetValue(netId, out var obj)) { if (!await obj.HandleRpcAsync(sender, target, (RpcCalls)reader.ReadByte(), reader)) { @@ -213,7 +213,7 @@ namespace Impostor.Server.Net.State case GameDataTag.DespawnFlag: { var netId = reader.ReadPackedUInt32(); - if (_allObjectsFast.TryGetValue(netId, out var obj)) + if (_allObjects.TryGetValue(netId, out var obj)) { if (sender.Client.Id != obj.OwnerId && !sender.IsHost) { @@ -467,7 +467,7 @@ namespace Impostor.Server.Net.State private async ValueTask SyncServerObjectsAsync(ClientPlayer sender) { - foreach (var obj in _allObjectsFast.Values) + foreach (var obj in _allObjects.Values) { if (obj.OwnerId == ServerOwned) { @@ -532,12 +532,12 @@ namespace Impostor.Server.Net.State private bool AddNetObject(InnerNetObject obj) { - return _allObjectsFast.TryAdd(obj.NetId, obj); + return _allObjects.TryAdd(obj.NetId, obj); } private void RemoveNetObject(InnerNetObject obj) { - _allObjectsFast.TryRemove(obj.NetId, out _); + _allObjects.TryRemove(obj.NetId, out _); } } }