Fix #41

Author: valkyrienyanko

Scripts/Netcode/Common/SPacketLobbyChatMessage.cs

@@ -18,6 +18,9 @@ public override void Read(PacketReader reader)
 
         public override void Handle()
         {
+            if (!SceneManager.InLobby())
+                return;
+            
             SceneLobby.Log(Id, Message);
         }
     }

Scripts/Netcode/Common/SPacketLobbyCountdownChange.cs

@@ -20,6 +20,9 @@ public override void Read(PacketReader reader)
 
         public override void Handle()
         {
+            if (!SceneManager.InLobby())
+                return;
+
             if (CountdownRunning)
                 SceneLobby.StartGameCountdown();
             else

Scripts/Netcode/Common/SPacketLobbyGameStart.cs

@@ -7,6 +7,9 @@ public class SPacketLobbyGameStart : APacketServer
     {
         public override void Handle()
         {
+            if (!SceneManager.InLobby())
+                return;
+
             if (GameClient.IsHost) 
             {
                 GameServer.TimerGameLoop.Enabled = true;

Scripts/Netcode/Common/SPacketLobbyInfo.cs

@@ -42,6 +42,9 @@ public override void Read(PacketReader reader)
 
         public override void Handle()
         {
+            if (!SceneManager.InGameServers())
+                return;
+
             ENetClient.PeerId = Id;
             ENetClient.IsHost = IsHost;
             ENetClient.Log($"{GameManager.Options.OnlineUsername} joined lobby with id {Id} also other players in lobby are {Players.Print()}");

Scripts/Netcode/Common/SPacketLobbyJoin.cs

@@ -20,6 +20,9 @@ public override void Read(PacketReader reader)
 
         public override void Handle()
         {
+            if (!SceneManager.InLobby())
+                return;
+
             SceneLobby.AddPlayer(Id, Username);
 
             ENetClient.Log($"Player with username {Username} id: {Id} joined the lobby");

Scripts/Netcode/Common/SPacketLobbyLeave.cs

@@ -16,6 +16,9 @@ public override void Read(PacketReader reader)
 
         public override void Handle()
         {
+            if (!SceneManager.InLobby())
+                return;
+                
             if (!GameClient.Players.ContainsKey(Id))
             {
                 ENetClient.Log($"Received LobbyLeave packet from server for id {Id}. Tried to remove from Players but does not exist in Players to begin with");

Scripts/Netcode/Common/SPacketLobbyReady.cs

@@ -20,6 +20,9 @@ public override void Read(PacketReader reader)
 
         public override void Handle()
         {
+            if (!SceneManager.InLobby())
+                return;
+                
             SceneLobby.SetReady(Id, Ready);
         }
     }

Scripts/Netcode/Common/SPacketPlayerPositions.cs

@@ -43,6 +43,9 @@ public override void Read(PacketReader reader)
 
         public override void Handle()
         {
+            if (!SceneManager.InGame())
+                return;
+
             SceneGame.UpdatePlayerPositions(PlayerPositions);
         }
     }

Scripts/Netcode/Server/GameServer.cs

@@ -12,27 +12,34 @@ namespace GodotModules.Netcode.Server
     public class GameServer : ENetServer
     {
         public static Dictionary<uint, DataPlayer> Players { get; set; }
+        public static Dictionary<uint, Vector2> LastSentPlayerPositions { get; set; }
         public static Timer TimerGameLoop { get; set; }
         public static Timer TimerNotifyClients { get; set; }
         public static float Delta { get; set; }
 
         public GameServer()
         {
             Players = new Dictionary<uint, DataPlayer>();
+            LastSentPlayerPositions = new Dictionary<uint, Vector2>();
             TimerGameLoop = new Timer(16.67);
             TimerGameLoop.Elapsed += TimerGameLoopCallback;
             TimerGameLoop.AutoReset = true;
 
-            TimerNotifyClients = new Timer(1000);
+            TimerNotifyClients = new Timer(100);
             TimerNotifyClients.Elapsed += TimerNotifyClientsCallback;
             TimerNotifyClients.AutoReset = true;
         }
 
         public void TimerNotifyClientsCallback(System.Object source, ElapsedEventArgs args)
         {
+            var playerPositions = Players.ToDictionary(x => x.Key, x => x.Value.Position);
+            System.Console.WriteLine("DEBUG: " + playerPositions.Count);
+
             SendToAllPlayers(ServerPacketOpcode.PlayerPositions, new SPacketPlayerPositions {
-                PlayerPositions = Players.ToDictionary(x => x.Key, x => x.Value.Position)
+                PlayerPositions = playerPositions
             }, PacketFlags.Reliable);
+
+            LastSentPlayerPositions = playerPositions;
         }
 
         public void TimerGameLoopCallback(System.Object source, ElapsedEventArgs args) 

Scripts/Scenes/Game/SceneGame.cs

@@ -30,6 +30,7 @@ public override void _Ready()
             // set game definitions
             ModLoader.Script.Globals["Player", "setHealth"] = (Action<int>)SceneGame.Player.SetHealth;
 
+            Utils.Log("SceneGame.cs _Ready()");
             ModLoader.Call("OnGameInit");
 
             if (GameClient.Running)