Skip to content

Commit eacd43f

Browse files
committed
Made collections readonly
1 parent cf3576c commit eacd43f

File tree

6 files changed

+39
-39
lines changed

6 files changed

+39
-39
lines changed

MLAPI/Data/Cache.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ namespace MLAPI.Data
55
{
66
internal static class Cache
77
{
8-
internal static Dictionary<string, ulong> messageAttributeHashes = new Dictionary<string, ulong>();
9-
internal static Dictionary<ulong, string> messageAttributeNames = new Dictionary<ulong, string>();
8+
internal static readonly Dictionary<string, ulong> messageAttributeHashes = new Dictionary<string, ulong>();
9+
internal static readonly Dictionary<ulong, string> messageAttributeNames = new Dictionary<ulong, string>();
1010

1111
internal static ulong GetMessageAttributeHash(string name, AttributeMessageMode mode)
1212
{

MLAPI/MonoBehaviours/Core/NetworkingManager.cs

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public uint MyClientId
6565
}
6666
}
6767
internal uint myClientId;
68-
internal Dictionary<uint, NetworkedClient> connectedClients;
68+
internal readonly Dictionary<uint, NetworkedClient> connectedClients = new Dictionary<uint, NetworkedClient>();
6969
/// <summary>
7070
/// Gets a dictionary of connected clients
7171
/// </summary>
@@ -76,7 +76,7 @@ public Dictionary<uint, NetworkedClient> ConnectedClients
7676
return connectedClients;
7777
}
7878
}
79-
internal HashSet<uint> pendingClients;
79+
internal readonly HashSet<uint> pendingClients = new HashSet<uint>();
8080
internal bool _isServer;
8181
internal bool _isClient;
8282
/// <summary>
@@ -146,7 +146,7 @@ public bool IsClientConnected
146146
public NetworkConfig NetworkConfig;
147147

148148
internal EllipticDiffieHellman clientDiffieHellman;
149-
internal Dictionary<uint, byte[]> diffieHellmanPublicKeys;
149+
internal readonly Dictionary<uint, byte[]> diffieHellmanPublicKeys = new Dictionary<uint, byte[]>();
150150
internal byte[] clientAesKey;
151151

152152
/// <summary>
@@ -220,26 +220,26 @@ private object Init(bool server)
220220
lastEventTickTime = 0f;
221221
lastReceiveTickTime = 0f;
222222
eventOvershootCounter = 0f;
223-
pendingClients = new HashSet<uint>();
224-
connectedClients = new Dictionary<uint, NetworkedClient>();
223+
pendingClients.Clear();
224+
connectedClients.Clear();
225225
messageBuffer = new byte[NetworkConfig.MessageBufferSize];
226-
diffieHellmanPublicKeys = new Dictionary<uint, byte[]>();
227-
Data.Cache.messageAttributeHashes = new Dictionary<string, ulong>();
228-
Data.Cache.messageAttributeNames = new Dictionary<ulong, string>();
229-
MessageManager.channels = new Dictionary<string, int>();
230-
MessageManager.messageTypes = new Dictionary<string, ushort>();
231-
MessageManager.messageCallbacks = new Dictionary<ushort, Dictionary<int, Action<uint, BitReader>>>();
232-
MessageManager.messageHandlerCounter = new Dictionary<ushort, int>();
233-
MessageManager.releasedMessageHandlerCounters = new Dictionary<ushort, Stack<int>>();
234-
MessageManager.reverseChannels = new Dictionary<int, string>();
235-
MessageManager.reverseMessageTypes = new Dictionary<ushort, string>();
236-
SpawnManager.spawnedObjects = new Dictionary<uint, NetworkedObject>();
237-
SpawnManager.releasedNetworkObjectIds = new Stack<uint>();
238-
NetworkPoolManager.Pools = new Dictionary<ushort, NetworkPool>();
239-
NetworkPoolManager.PoolNamesToIndexes = new Dictionary<string, ushort>();
240-
NetworkSceneManager.registeredSceneNames = new HashSet<string>();
241-
NetworkSceneManager.sceneIndexToString = new Dictionary<uint, string>();
242-
NetworkSceneManager.sceneNameToIndex = new Dictionary<string, uint>();
226+
diffieHellmanPublicKeys.Clear();
227+
Data.Cache.messageAttributeHashes.Clear();
228+
Data.Cache.messageAttributeNames.Clear();
229+
MessageManager.channels.Clear();
230+
MessageManager.messageTypes.Clear();
231+
MessageManager.messageCallbacks.Clear();
232+
MessageManager.messageHandlerCounter.Clear();
233+
MessageManager.releasedMessageHandlerCounters.Clear();
234+
MessageManager.reverseChannels.Clear();
235+
MessageManager.reverseMessageTypes.Clear();
236+
SpawnManager.spawnedObjects.Clear();
237+
SpawnManager.releasedNetworkObjectIds.Clear();
238+
NetworkPoolManager.Pools.Clear();
239+
NetworkPoolManager.PoolNamesToIndexes.Clear();
240+
NetworkSceneManager.registeredSceneNames.Clear();
241+
NetworkSceneManager.sceneIndexToString.Clear();
242+
NetworkSceneManager.sceneNameToIndex.Clear();
243243
InternalMessageHandler.FinalMessageBuffer = new byte[NetworkConfig.MessageBufferSize];
244244

245245
if (NetworkConfig.Transport == DefaultTransport.UNET)

MLAPI/NetworkingManagerComponents/Core/MessageManager.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ namespace MLAPI.NetworkingManagerComponents.Core
77
{
88
internal static class MessageManager
99
{
10-
internal static Dictionary<string, int> channels;
11-
internal static Dictionary<int, string> reverseChannels;
12-
internal static Dictionary<string, ushort> messageTypes;
13-
internal static Dictionary<ushort, string> reverseMessageTypes;
14-
15-
internal static Dictionary<ushort, Dictionary<int, Action<uint, BitReader>>> messageCallbacks;
16-
internal static Dictionary<ushort, int> messageHandlerCounter;
17-
internal static Dictionary<ushort, Stack<int>> releasedMessageHandlerCounters;
10+
internal static readonly Dictionary<string, int> channels = new Dictionary<string, int>();
11+
internal static readonly Dictionary<int, string> reverseChannels = new Dictionary<int, string>();
12+
internal static readonly Dictionary<string, ushort> messageTypes = new Dictionary<string, ushort>();
13+
internal static readonly Dictionary<ushort, string> reverseMessageTypes = new Dictionary<ushort, string>();
14+
15+
internal static readonly Dictionary<ushort, Dictionary<int, Action<uint, BitReader>>> messageCallbacks = new Dictionary<ushort, Dictionary<int, Action<uint, BitReader>>>();
16+
internal static readonly Dictionary<ushort, int> messageHandlerCounter = new Dictionary<ushort, int>();
17+
internal static readonly Dictionary<ushort, Stack<int>> releasedMessageHandlerCounters = new Dictionary<ushort, Stack<int>>();
1818

1919
private static NetworkingManager netManager
2020
{

MLAPI/NetworkingManagerComponents/Core/NetworkPoolManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ namespace MLAPI.NetworkingManagerComponents.Core
1111
/// </summary>
1212
public static class NetworkPoolManager
1313
{
14-
internal static Dictionary<ushort, NetworkPool> Pools;
14+
internal static readonly Dictionary<ushort, NetworkPool> Pools = new Dictionary<ushort, NetworkPool>();
1515
private static ushort PoolIndex = 0;
16-
internal static Dictionary<string, ushort> PoolNamesToIndexes;
16+
internal static readonly Dictionary<string, ushort> PoolNamesToIndexes = new Dictionary<string, ushort>();
1717

1818
/// <summary>
1919
/// Creates a networked object pool. Can only be called from the server

MLAPI/NetworkingManagerComponents/Core/NetworkSceneManager.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ namespace MLAPI.NetworkingManagerComponents.Core
1212
/// </summary>
1313
public static class NetworkSceneManager
1414
{
15-
internal static HashSet<string> registeredSceneNames;
16-
internal static Dictionary<string, uint> sceneNameToIndex;
17-
internal static Dictionary<uint, string> sceneIndexToString;
15+
internal static readonly HashSet<string> registeredSceneNames = new HashSet<string>();
16+
internal static readonly Dictionary<string, uint> sceneNameToIndex = new Dictionary<string, uint>();
17+
internal static readonly Dictionary<uint, string> sceneIndexToString = new Dictionary<uint, string>();
1818
private static Scene lastScene;
1919
private static Scene nextScene;
2020
private static bool isSwitching = false;

MLAPI/NetworkingManagerComponents/Core/SpawnManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ namespace MLAPI.NetworkingManagerComponents.Core
88
{
99
internal static class SpawnManager
1010
{
11-
internal static Dictionary<uint, NetworkedObject> spawnedObjects;
12-
internal static Stack<uint> releasedNetworkObjectIds;
11+
internal static readonly Dictionary<uint, NetworkedObject> spawnedObjects = new Dictionary<uint, NetworkedObject>();
12+
internal static readonly Stack<uint> releasedNetworkObjectIds = new Stack<uint>();
1313
private static uint networkObjectIdCounter;
1414
internal static uint GetNetworkObjectId()
1515
{

0 commit comments

Comments
 (0)