Server now correctly sends chunks to clients :D + Quick and dirty fix for crashes on disconnection

Author: Blue Staggo

VoxelThing.Client/src/ClientPacketHandler.cs

@@ -44,7 +44,6 @@ void SConnectionAccepted(SConnectionAccepted packet)
 
     void SDisconnect(SDisconnect packet)
     {
-        Client.DisconnectFromServer();
         Client.ExitWorld();
         Client.CurrentScreen = new MultiplayerDisconnectionScreen(Client, packet.Reason);
     }

VoxelThing.Client/src/Game.cs

@@ -39,7 +39,7 @@ public class Game : GameWindow
     public const double TickRate = 1.0 / TicksPerSecond;
     public const int HandshakeRate = TicksPerSecond;
     public const int MaxTimeWithoutHandshake = TicksPerSecond * 5;
-    public const bool EnableCursorGrab = false;
+    public const bool EnableCursorGrab = true;
     public const bool OpenGlDebugging = SharedConstants.Debug; // Only enable this if your drivers support OpenGL 4.3+
 
     public static double TimeElapsed => GLFW.GetTime();
@@ -237,24 +237,23 @@ protected override void OnUpdateFrame(FrameEventArgs args)
             }
             Profiler.Pop();
 
-            if (PacketHandler is not null)
+            if (PacketHandler is null) continue;
+            
+            if (Ticks > PacketHandler.TimeSinceLastHandshake
+                && Ticks - PacketHandler.TimeSinceLastHandshake > MaxTimeWithoutHandshake)
             {
-                if (Ticks > PacketHandler.TimeSinceLastHandshake
-                    && Ticks - PacketHandler.TimeSinceLastHandshake > MaxTimeWithoutHandshake)
-                {
-                    PacketHandler.HandlePacket(new SDisconnect("Timed out"));
-                }
-                else
-                {
-                    if (Ticks % HandshakeRate == 0)
-                        PacketHandler.Server.SendPacket(CHandshake.Instance);
+                PacketHandler.HandlePacket(new SDisconnect("Timed out"));
+            }
+            else
+            {
+                if (Ticks % HandshakeRate == 0)
+                    PacketHandler.Server.SendPacket(CHandshake.Instance);
 
-                    if (Player is not null)
-                        PacketHandler.Server.SendPacket(new CUpdatePosition(Player));
+                if (Player is not null)
+                    PacketHandler.Server.SendPacket(new CUpdatePosition(Player));
 
-                    while (PacketHandler.Server.PendingPackets.TryDequeue(out IPacket? packet))
-                        PacketHandler.HandlePacket(packet);
-                }
+                while (PacketHandler.Server.PendingPackets.TryDequeue(out IPacket? packet))
+                    PacketHandler.HandlePacket(packet);
             }
         }
 
@@ -474,11 +473,9 @@ public void ExitWorld()
         if (World is null)
             return;
 
-        if (Player is not null)
-        {
+        if (Player is not null && !World.Remote)
             World.SaveHandler.SaveData("player", (CompoundItem)Player.Serialize());
-            Player = null;
-        }
+        Player = null;
 
         World.Close();
         World = null;

VoxelThing.Client/src/Gui/Screens/PauseScreen.cs

@@ -41,6 +41,7 @@ public PauseScreen(Game game) : base(game)
         exitButton.OnClick += (_, _) =>
         {
             game.ExitWorld();
+            game.DisconnectFromServer();
             game.CurrentScreen = Parent;
         };
     }

VoxelThing.Game/src/Networking/Connection.cs

@@ -22,6 +22,8 @@ public class Connection : IDisposable
     private readonly BinaryReader networkBinaryReader;
     private readonly BinaryWriter networkBinaryWriter;
 
+    private bool disposed;
+
     public Connection(TcpClient tcpClient, IPEndPoint ipEndPoint, PacketSide side)
     {
         this.tcpClient = tcpClient;
@@ -41,6 +43,8 @@ public void StartListening()
 
     public void SendPacket(IPacket packet)
     {
+        if (disposed) return;
+        
         try
         {
             if (SharedConstants.PrintPackets)
@@ -51,6 +55,7 @@ public void SendPacket(IPacket packet)
         {
             Disconnected?.Invoke(this, EventArgs.Empty);
         }
+        catch (ObjectDisposedException) { }
     }
 
     private void ListenForPackets()
@@ -72,6 +77,7 @@ private void ListenForPackets()
 
     public void Dispose()
     {
+        disposed = true;
         GC.SuppressFinalize(this);
         cancellationTokenSource.Cancel();
         tcpClient.Dispose();

VoxelThing.Game/src/Networking/IPacket.cs

@@ -15,7 +15,7 @@ public interface IPacket
         if (!PacketManager.ForSide(senderSide).TryGetPacketTypeFromId(id, out Type? type))
             return null;
 
-        ushort length = reader.ReadUInt16();
+        int length = reader.Read7BitEncodedInt();
         if (length == 0)
             return null;
 
@@ -38,11 +38,9 @@ void IPacket.Write(BinaryWriter writer)
         if (id == 0)
             return;
         byte[] serialized = MemoryPackSerializer.Serialize((T)this);
-        if (serialized.Length > ushort.MaxValue)
-            return;
 
         writer.Write(id);
-        writer.Write((ushort)serialized.Length);
+        writer.Write7BitEncodedInt(serialized.Length);
         writer.Write(MemoryPackSerializer.Serialize((T)this));
     }
 }

VoxelThing.Server/src/Client.cs

@@ -16,19 +16,19 @@ public class Client : IDisposable
 
     public IPEndPoint IpEndPoint => Connection.IpEndPoint;
 
-    private readonly PlayerIsland Island;
+    private readonly PlayerIsland island;
 
     public Client(GameServer server, Connection connection)
     {
         Connection = connection;
         Server = server;
         PacketHandler = new(server, this);
-        Island = new(this);
+        island = new(this);
     }
 
     public void Update()
     {
-        Island.Update();
+        island.Update();
     }
 
     public void SendPacket(IPacket packet) => Connection.SendPacket(packet);