Remove all static from ServerSimulation

Author: valkyrienyanko

Scripts/Netcode/Common/CPacketPlayerPosition.cs

@@ -25,7 +25,7 @@ public override void Read(PacketReader reader)
         public override void Handle(ENet.Peer peer)
         {
             NetworkManager.GameServer.Players[(byte)peer.ID].Position = Position;
-            ServerSimulation.Enqueue(new ThreadCmd<SimulationOpcode>(SimulationOpcode.PlayerPosition, new SimulationPlayerPosition((byte)peer.ID, Position)));
+            NetworkManager.ServerSimulation.Enqueue(new ThreadCmd<SimulationOpcode>(SimulationOpcode.PlayerPosition, new SimulationPlayerPosition((byte)peer.ID, Position)));
         }
     }
 }

Scripts/Netcode/Common/Server/GameServer.cs

@@ -77,7 +77,7 @@ protected override void ServerCmds()
 
                         foreach (var player in Players)
                         {
-                            ServerSimulation.Enqueue(new ThreadCmd<SimulationOpcode>(SimulationOpcode.CreatePlayer, player.Key));
+                            NetworkManager.ServerSimulation.Enqueue(new ThreadCmd<SimulationOpcode>(SimulationOpcode.CreatePlayer, player.Key));
                         }
 
                         var enemies = new List<SimulationEnemy>();
@@ -87,7 +87,7 @@ protected override void ServerCmds()
                             var enemy = new SimulationEnemy() { Id = EnemyId++ };
                             enemy.RandomDirOnSpawn(50);
                             enemies.Add(enemy);
-                            ServerSimulation.Enqueue(new ThreadCmd<SimulationOpcode>(SimulationOpcode.CreateEnemy, enemy));
+                            NetworkManager.ServerSimulation.Enqueue(new ThreadCmd<SimulationOpcode>(SimulationOpcode.CreateEnemy, enemy));
                         }
 
                         // Tell everyone that 10 enemies were created
@@ -97,7 +97,7 @@ protected override void ServerCmds()
                             })
                         });
 
-                        ServerSimulation.Enqueue(new ThreadCmd<SimulationOpcode>(SimulationOpcode.StartSimulation));
+                        NetworkManager.ServerSimulation.Enqueue(new ThreadCmd<SimulationOpcode>(SimulationOpcode.StartSimulation));
                         break;
 
                     case ENetOpcode.EnemyTransforms:

Scripts/Netcode/Common/Server/ServerSimulation.cs

@@ -5,18 +5,15 @@ namespace GodotModules.Netcode.Server
 {
     public class ServerSimulation : Node
     {
-        private static ConcurrentQueue<ThreadCmd<SimulationOpcode>> ServerSimulationQueue = new ConcurrentQueue<ThreadCmd<SimulationOpcode>>();
+        private ConcurrentQueue<ThreadCmd<SimulationOpcode>> ServerSimulationQueue = new ConcurrentQueue<ThreadCmd<SimulationOpcode>>();
 
-        public static Dictionary<ushort, Enemy> Enemies = new Dictionary<ushort, Enemy>();
+        private Dictionary<ushort, Enemy> Enemies = new Dictionary<ushort, Enemy>();
         private Dictionary<byte, Game.OtherPlayer> Players;
-
-        private static ServerSimulation Instance { get; set; }
-        private static GTimer Timer { get; set; }
-        private static Dictionary<byte, PrevCurQueue<Vector2>> PlayerPositions = new Dictionary<byte, PrevCurQueue<Vector2>>();
+        private GTimer Timer { get; set; }
+        private Dictionary<byte, PrevCurQueue<Vector2>> PlayerPositions = new Dictionary<byte, PrevCurQueue<Vector2>>();
 
         public override void _Ready()
         {
-            Instance = this;
             Players = new Dictionary<byte, Game.OtherPlayer>();
             Timer = new GTimer(ServerIntervals.PlayerTransforms, true, false);
             Timer.Connect(this, nameof(EmitSimulationData));
@@ -35,7 +32,7 @@ public override void _PhysicsProcess(float delta)
             }
         }
 
-        public static void Enqueue(ThreadCmd<SimulationOpcode> cmd) => ServerSimulationQueue.Enqueue(cmd);
+        public void Enqueue(ThreadCmd<SimulationOpcode> cmd) => ServerSimulationQueue.Enqueue(cmd);
 
         public void Dequeue()
         {
@@ -84,7 +81,7 @@ private void CreatePlayer(byte id)
             otherPlayer.AddToGroup("Player");
             otherPlayer.Position = Vector2.Zero;
             Players.Add(id, otherPlayer);
-            Instance.AddChild(otherPlayer);
+            AddChild(otherPlayer);
         }
 
         private void CreateEnemy(SimulationEnemy simEnemy)
@@ -94,7 +91,7 @@ private void CreateEnemy(SimulationEnemy simEnemy)
             enemy.SetPlayers(Players);
             enemy.Position = simEnemy.SpawnForce;
             Enemies.Add(simEnemy.Id, enemy);
-            Instance.AddChild(enemy);
+            AddChild(enemy);
         }
 
         private void EmitSimulationData()