more thread safety

Author: valkyrienyanko

Scripts/Netcode/Client/ENetClient.cs

@@ -12,12 +12,6 @@ public class ENetClient : IDisposable
     {
         public static readonly Dictionary<ServerPacketOpcode, APacketServer> HandlePacket = ReflectionUtils.LoadInstances<ServerPacketOpcode, APacketServer>("SPacket");
 
-        // values grabbed from the server
-        // =========================================================
-        public uint PeerId { get; set; } // this clients peer id (grabbed from server at some point)
-        public bool IsHost { get; set; }
-        // =========================================================
-
         public DateTime PingSent { get; set; }
         public int PingMs { get; set;}
         public bool WasPingReceived { get; set; }

Scripts/Netcode/Common/SPacketLobby.cs

@@ -167,8 +167,8 @@ public override async Task Handle(ENetClient client)
         // LobbyCreate
         private async Task HandleCreate()
         {
-            Client.PeerId = Id;
-            Client.IsHost = true;
+            NetworkManager.PeerId = Id;
+            NetworkManager.IsHost = true;
             Client.Log($"{GameManager.Options.OnlineUsername} created lobby with their id being {Id}");
             Client.Players[Id] = GameManager.Options.OnlineUsername;
 
@@ -201,7 +201,7 @@ private void HandleCountdownChange()
         // LobbyGameStart
         private async Task HandleGameStart()
         {
-            if (Client.IsHost)
+            if (NetworkManager.IsHost)
                 NetworkManager.GameServer.ENetCmds.Enqueue(new ENetCmd(ENetOpcode.StartGame));
 
             await SceneManager.ChangeScene("Game");
@@ -216,7 +216,7 @@ private async Task HandleGameStart()
         public byte LobbyHostId { get; set; }
         private async Task HandleInfo()
         {
-            Client.PeerId = Id;
+            NetworkManager.PeerId = Id;
             Client.Log($"{GameManager.Options.OnlineUsername} joined lobby with id {Id}");
             Client.Players[Id] = GameManager.Options.OnlineUsername;
             Players.ForEach(pair => NetworkManager.GameClient.Players[pair.Key] = pair.Value.Username);

Scripts/Scenes/Game/SceneGame.cs

@@ -104,10 +104,10 @@ public void RemovePlayer(byte id)
 
         private void InitMultiplayerStuff()
         {
-            Players[NetworkManager.GameClient.PeerId] = Player;
+            Players[NetworkManager.PeerId] = Player;
             Player.SetUsername(GameManager.Options.OnlineUsername);
 
-            bool IsNotClient(uint id) => id != NetworkManager.GameClient.PeerId; // THREAD SAFETY VIOLATION
+            bool IsNotClient(uint id) => id != NetworkManager.PeerId;
 
             NetworkManager.GameClient.Players
                 .Where(x => IsNotClient(x.Key))

Scripts/Scenes/Lobby/SceneLobby.cs

@@ -45,7 +45,7 @@ public override void _Ready()
             UIPlayers = new();
             TimerCountdownGameStart = new STimer(1000, TimerCountdownCallback, false);
 
-            if (!NetworkManager.GameClient.IsHost) // THREAD SAFETY VIOLATION
+            if (!NetworkManager.IsHost)
                 BtnStart.Disabled = true;
 
             NetworkManager.GameClient.Players.ForEach(x => AddPlayer(x.Key, x.Value));
@@ -74,7 +74,7 @@ private async void TimerCountdownCallback()
             {
                 TimerCountdownGameStart.Stop();
 
-                if (NetworkManager.GameClient.IsHost) // THREAD SAFETY VIOLATION
+                if (NetworkManager.IsHost)
                 {
                     WebClient.TimerPingMasterServer.Stop();
 
@@ -151,7 +151,7 @@ public void Log(uint peerId, string text)
 
         private async void _on_Ready_pressed()
         {
-            var player = UIPlayers[NetworkManager.GameClient.PeerId]; // THREAD SAFETY VIOLATION
+            var player = UIPlayers[NetworkManager.PeerId];
             player.SetReady(!player.Ready);
 
             BtnReady.Text = player.Ready ? "Ready" : "Not Ready";
@@ -165,7 +165,7 @@ private async void _on_Ready_pressed()
 
         private async void _on_Start_pressed()
         {
-            if (!NetworkManager.GameClient.IsHost) // THREAD SAFETY VIOLATION
+            if (!NetworkManager.IsHost)
                 return;
 
             // check if all players are ready

Scripts/Scenes/Main/NetworkManager.cs

@@ -18,6 +18,9 @@ public class NetworkManager : Node
         public static NetworkManager Instance { get; set; }
         private static CancellationTokenSource ClientConnectingTokenSource { get; set; }
 
+        public static uint PeerId { get; set; } // this clients peer id (grabbed from server at some point)
+        public static bool IsHost { get; set; }
+
         public override void _Ready()
         {
             Instance = this;