Remove all server-side player position sync code

Author: valkyrienyanko

Scripts/Netcode/Common/CPacketPlayerDirectionPressed.cs

@@ -12,8 +12,7 @@ public override void Handle()
 
             if (GameClient.IsHost) 
             {
-                GameServer.TimerGameLoop.Enabled = true;
-                GameServer.TimerNotifyClients.Enabled = true;
+                GameServer.EmitClientPositions.Enabled = true;
             }
 
             SceneManager.ChangeScene("Game");

Scripts/Netcode/Common/SPacketLobbyGameStart.cs

@@ -8,8 +8,7 @@ public enum ClientPacketOpcode
         LobbyChatMessage,
         LobbyReady,
         LobbyCountdownChange,
-        LobbyGameStart,
-        PlayerDirectionPressed
+        LobbyGameStart
     }
 
     // Sent to Game Client

Scripts/Netcode/Common/_Opcodes.cs

@@ -12,58 +12,25 @@ 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 Timer EmitClientPositions { 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(200);
-            TimerNotifyClients.Elapsed += TimerNotifyClientsCallback;
-            TimerNotifyClients.AutoReset = true;
+
+            EmitClientPositions = new Timer(200);
+            EmitClientPositions.Elapsed += EmitClientPositionsCallback;
+            EmitClientPositions.AutoReset = true;
         }
 
-        public void TimerNotifyClientsCallback(System.Object source, ElapsedEventArgs args)
+        public void EmitClientPositionsCallback(System.Object source, ElapsedEventArgs args)
         {
             var playerPositions = Players.ToDictionary(x => x.Key, x => x.Value.Position);
 
             SendToAllPlayers(ServerPacketOpcode.PlayerPositions, new SPacketPlayerPositions {
                 PlayerPositions = playerPositions
             }, PacketFlags.Reliable);
-
-            LastSentPlayerPositions = playerPositions;
-
-            //System.Console.WriteLine("SERVER: " + playerPositions[0]);
-        }
-
-        public void TimerGameLoopCallback(System.Object source, ElapsedEventArgs args) 
-        {
-            foreach (var pair in Players)
-            {
-                var player = pair.Value;
-
-                var dir = new Vector2();
-
-                if (player.DirectionHorizontal == Direction.West)
-                    dir.x -= 1;
-                if (player.DirectionHorizontal == Direction.East)
-                    dir.x += 1;
-                if (player.DirectionVertical == Direction.North)
-                    dir.y -= 1;
-                if (player.DirectionVertical == Direction.South)
-                    dir.y += 1;
-
-                var delta = 0.016667f;
-
-                player.Position += dir * 250 * delta;
-            }
         }
 
         protected override void Connect(Event netEvent)
@@ -136,18 +103,5 @@ public static void SendToOtherPlayers(uint id, ServerPacketOpcode opcode, APacke
             else
                 Send(opcode, data, flags, otherPlayers);
         }
-
-        public static void UpdatePressed(uint id, Direction directionHorizontal, Direction directionVertical, bool pressed)
-        {
-            var player = Players[id];
-            player.DirectionHorizontal = directionHorizontal;
-            player.DirectionVertical = directionVertical;
-        }
-
-        public static void CheckPosition(uint id, Vector2 position)
-        {
-            var player = Players[id];
-            Log("Distance: " + position.DistanceSquaredTo(player.Position));
-        }
     }
 }

Scripts/Netcode/Server/GameServer.cs

@@ -16,10 +16,7 @@ public class ClientPlayer : OtherPlayer
         private Label LabelPosition { get; set; }
 
         private float Speed = 250f;
-        private Timer NotifyServerPlayerDirection { get; set; }
-        private float Delta { get; set; }
-        private Direction DirectionHorizontal { get; set; }
-        private Direction DirectionVertical { get; set; }
+        private Timer EmitPosition { get; set; }
 
         public override void _Ready()
         {
@@ -29,28 +26,20 @@ public override void _Ready()
 
             if (GameClient.Running)
             {
-                NotifyServerPlayerDirection = new Timer(50);
-                NotifyServerPlayerDirection.Elapsed += NotifyServerPlayerDirectionCallback;
-                NotifyServerPlayerDirection.AutoReset = true;
-                NotifyServerPlayerDirection.Enabled = true;
+                EmitPosition = new Timer(200);
+                EmitPosition.Elapsed += EmitPositionCallback;
+                EmitPosition.AutoReset = true;
+                EmitPosition.Enabled = true;
             }
         }
 
-        public async void NotifyServerPlayerDirectionCallback(System.Object source, ElapsedEventArgs args)
+        public async void EmitPositionCallback(System.Object source, ElapsedEventArgs args)
         {
-            //if (DirectionHorizontal == Direction.None && DirectionVertical == Direction.None) 
-                //return;
-
-            await GameClient.Send(ClientPacketOpcode.PlayerDirectionPressed, new CPacketPlayerDirectionPressed
-            {
-                DirectionHorizontal = DirectionHorizontal,
-                DirectionVertical = DirectionVertical
-            });
+            
         }
 
         public override void _PhysicsProcess(float delta)
         {
-            Delta = delta;
             LabelPosition.Text = $"X: {Mathf.RoundToInt(Position.x)} Y: {Mathf.RoundToInt(Position.y)}";
             HandleMovement(delta);
         }
@@ -69,41 +58,6 @@ private void HandleMovement(float delta)
                 dir.y += 1;
 
             Position += dir * Speed * delta;
-
-            if (DirectionHorizontal == Direction.None && DirectionVertical == Direction.None)
-                Position = Utils.Lerp(Position, SceneGame.ServerPlayerPositions[GameClient.PeerId], 0.01f);
-
-
-            //else
-                //Position = Utils.Lerp(Position, SceneGame.ServerPlayerPosition, 0.05f);
-
-            UpdateDirectionPressed();
-        }
-
-        private void UpdateDirectionPressed()
-        {
-            if (!GameClient.Running)
-                return;
-
-            // PRESSED
-            if (Input.IsActionJustPressed("ui_left"))
-                DirectionHorizontal = Direction.West;
-            if (Input.IsActionJustPressed("ui_right"))
-                DirectionHorizontal = Direction.East;
-            if (Input.IsActionJustPressed("ui_up"))
-                DirectionVertical = Direction.North;
-            if (Input.IsActionJustPressed("ui_down"))
-                DirectionVertical = Direction.South;
-
-            // RELEASED
-            if (Input.IsActionJustReleased("ui_left"))
-                DirectionHorizontal = Direction.None;
-            if (Input.IsActionJustReleased("ui_right"))
-                DirectionHorizontal = Direction.None;
-            if (Input.IsActionJustReleased("ui_up"))
-                DirectionVertical = Direction.None;
-            if (Input.IsActionJustReleased("ui_down"))
-                DirectionVertical = Direction.None;
         }
 
         public void SetHealth(int v)

Scripts/Scenes/Game/ClientPlayer.cs

@@ -60,21 +60,6 @@ public static void UpdatePlayerPositions(Dictionary<uint, Vector2> playerPositio
                 return;
 
             ServerPlayerPositions = playerPositions;
-            
-            /*foreach (var pair in playerPositions) 
-            {
-                var player = Instance.Players[pair.Key];
-
-                if (pair.Key == GameClient.PeerId)
-                {
-                    //GD.Print("CLIENT: " + player.Position);
-                    ServerPlayerPosition = pair.Value;
-                    //if (player.Position.DistanceTo(pair.Value) > Test)
-                        //player.Position = Utils.Lerp(player.Position, pair.Value, 0.1f);
-                }
-                else
-                    player.Position = pair.Value;
-            }*/
         }
 
         public static int Test = 100;
@@ -86,9 +71,7 @@ public override void _Process(float delta)
             foreach (var pair in ServerPlayerPositions)
             {
                 var player = Players[pair.Key];
-
-                if (pair.Key != GameClient.PeerId)
-                    player.Position = Utils.Lerp(player.Position, pair.Value, 0.1f);
+                player.Position = Utils.Lerp(player.Position, pair.Value, 0.1f);
             }
         }
     }