Remove static from Players

Author: valkyrienyanko

Scenes/Main.tscn

@@ -21,6 +21,7 @@ script = ExtResource( 3 )
 
 [node name="NetworkManager" type="Node" parent="."]
 script = ExtResource( 4 )
+NodePathServerSimulation = NodePath("../CanvasLayer/Server Simulation/ViewportContainer/Viewport/Server Simulation")
 
 [node name="SceneManager" type="Node" parent="."]
 script = ExtResource( 5 )

Scripts/Netcode/Common/SPacketGame.cs

@@ -65,6 +65,7 @@ public override async Task Handle()
             {
                 var enemy = Prefabs.Enemy.Instance<GodotModules.Netcode.Server.Enemy>();
                 enemy.Position = pair.Value.Position;
+                enemy.SetPlayers(sceneGameScript.Players);
                 sceneGameScript.AddChild(enemy);
                 sceneGameScript.Enemies[pair.Key] = enemy;
             }

Scripts/Netcode/Common/Server/ServerSimulation.cs

@@ -8,7 +8,7 @@ public class ServerSimulation : Node
         private static ConcurrentQueue<ThreadCmd<SimulationOpcode>> ServerSimulationQueue = new ConcurrentQueue<ThreadCmd<SimulationOpcode>>();
 
         public static Dictionary<ushort, Enemy> Enemies = new Dictionary<ushort, Enemy>();
-        public static Dictionary<byte, Game.OtherPlayer> Players = new Dictionary<byte, Game.OtherPlayer>();
+        private Dictionary<byte, Game.OtherPlayer> Players;
 
         private static ServerSimulation Instance { get; set; }
         private static GTimer Timer { get; set; }
@@ -17,6 +17,7 @@ public class ServerSimulation : Node
         public override void _Ready()
         {
             Instance = this;
+            Players = new Dictionary<byte, Game.OtherPlayer>();
             Timer = new GTimer(ServerIntervals.PlayerTransforms, true, false);
             Timer.Connect(this, nameof(EmitSimulationData));
         }
@@ -36,7 +37,7 @@ public override void _PhysicsProcess(float delta)
 
         public static void Enqueue(ThreadCmd<SimulationOpcode> cmd) => ServerSimulationQueue.Enqueue(cmd);
 
-        public static void Dequeue()
+        public void Dequeue()
         {
             if (ServerSimulationQueue.TryDequeue(out ThreadCmd<SimulationOpcode> cmd))
             {
@@ -77,7 +78,7 @@ public static void Dequeue()
             }
         }
 
-        private static void CreatePlayer(byte id)
+        private void CreatePlayer(byte id)
         {
             var otherPlayer = Prefabs.OtherPlayer.Instance<Game.OtherPlayer>();
             otherPlayer.AddToGroup("Player");
@@ -86,10 +87,11 @@ private static void CreatePlayer(byte id)
             Instance.AddChild(otherPlayer);
         }
 
-        private static void CreateEnemy(SimulationEnemy simEnemy)
+        private void CreateEnemy(SimulationEnemy simEnemy)
         {
             var enemy = Prefabs.Enemy.Instance<Enemy>();
             enemy.AddToGroup("Enemy");
+            enemy.SetPlayers(Players);
             enemy.Position = simEnemy.SpawnForce;
             Enemies.Add(simEnemy.Id, enemy);
             Instance.AddChild(enemy);
@@ -105,7 +107,7 @@ private void EmitSimulationData()
             NetworkManager.GameServer.ENetCmds.Enqueue(new ThreadCmd<ENetOpcode>(ENetOpcode.EnemyTransforms, enemyData));
         }
 
-        public static void Cleanup()
+        public void Cleanup()
         {
             Timer.Stop();
             while (ServerSimulationQueue.TryDequeue(out _));

Scripts/Netcode/Common/Utils/NetworkManager.cs

@@ -11,6 +11,8 @@ namespace GodotModules.Netcode
 {
     public class NetworkManager : Node
     {
+        [Export] public readonly NodePath NodePathServerSimulation;
+
         private static SceneTree Tree { get; set; }
         private static bool ENetInitialized { get; set; }
         public static WebClient WebClient = new WebClient();
@@ -20,6 +22,7 @@ public override void _Ready()
         {
             Tree = GetTree();
             ServerAuthoritativeMovement = false;
+            ServerSimulation = GetNode<ServerSimulation>(NodePathServerSimulation);
 
             ENetInitialized = ENet.Library.Initialize();
             if (!ENetInitialized)
@@ -30,6 +33,7 @@ public override void _Ready()
 
         // SERVER
         public static GameServer GameServer { get; set; }
+        public static ServerSimulation ServerSimulation { get; set; }
         public static bool ServerAuthoritativeMovement { get; set; }
         private static int GameServerStillRunning { get; set; }
         public static bool IsServerRunning() => GameServer == null ? false : GameServer.IsRunning;

Scripts/Scenes/Game/Enemy.cs

@@ -23,29 +23,34 @@ public override void _PhysicsProcess(float delta)
         {
             Delta = delta;
 
-            var players = ServerSimulation.Players;
-            if (players.Count == 0) 
+            if (Players.Count == 0) 
                 return;
 
-            Sprite.LookAt(players.First().Value.Position);
+            Sprite.LookAt(Players.First().Value.Position);
         }
 
         public override void _IntegrateForces(Physics2DDirectBodyState state)
         {
             state.LinearVelocity = Velocity;
         }
 
+        public Dictionary<byte, Game.OtherPlayer> Players { get; set; }
+
+        public void SetPlayers(Dictionary<byte, Game.OtherPlayer> players) 
+        {
+            Players = players;
+        }
+
         private void CalcVelocity()
         {
-            var players = ServerSimulation.Players;
-            if (players.Count == 0) 
+            if (Players.Count == 0) 
             {
                 Velocity = Vector2.Zero;
                 return;
             }
 
             // TODO: Find nearest player instead of first player in array
-            var dir = (players.First().Value.Position - Position).Normalized();
+            var dir = (Players.First().Value.Position - Position).Normalized();
             Velocity = (dir * Delta * 10000f);
         }
 

Scripts/Scenes/Game/SceneGame.cs

@@ -12,7 +12,7 @@ public class SceneGame : AScene
         [Export] public readonly NodePath NodePathLabelPlayerHealth;
         public Label LabelPlayerHealth;
 
-        private Dictionary<uint, OtherPlayer> Players;
+        public Dictionary<byte, OtherPlayer> Players;
         public Dictionary<ushort, Enemy> Enemies;
         public ClientPlayer Player { get; set; }
         private PrevCurQueue<Dictionary<byte, DataEntityTransform>> PlayerTransformQueue { get; set; }
@@ -108,7 +108,7 @@ public void RemovePlayer(byte id)
 
         private void InitMultiplayerStuff()
         {
-            Players[NetworkManager.PeerId] = Player;
+            Players[(byte)NetworkManager.PeerId] = Player;
             Player.SetUsername(GameManager.Options.OnlineUsername);
 
             bool IsNotClient(uint id) => id != NetworkManager.PeerId;
@@ -119,7 +119,7 @@ private void InitMultiplayerStuff()
                 {
                     var otherPlayer = Prefabs.OtherPlayer.Instance<OtherPlayer>();
                     otherPlayer.Position = Vector2.Zero;
-                    Players.Add(pair.Key, otherPlayer);
+                    Players.Add((byte)pair.Key, otherPlayer);
                     AddChild(otherPlayer);
                     otherPlayer.SetUsername(pair.Value);
                 });

Scripts/Scenes/Main/GameManager.cs

@@ -19,7 +19,7 @@ public override void _Ready()
         public override async void _Process(float delta)
         {
             Logger.Dequeue();
-            ServerSimulation.Dequeue();
+            NetworkManager.ServerSimulation.Dequeue();
             await GodotCommands.Dequeue();
         }