V0.5.1 - Switched from TCPClient to Socket + Fixed Bugs

AdornedJoker · Dec 26, 2024 · 3bebb85 · 3bebb85
1 parent 6057c74
commit 3bebb85
Show file tree

Hide file tree

Showing 34 changed files with 182 additions and 151 deletions.
diff --git a/NetClassic/Commands/DeOpFunction.cs b/NetClassic/Commands/DeOpFunction.cs
@@ -5,7 +5,7 @@ namespace NetClassic
 {
     public class DeOpFunction : Commands
     {
-        public async Task HandleCommand(string adminCommand, NetworkStream stream)
+        public async Task HandleCommand(string adminCommand, Socket stream)
         {
             string getName = adminCommand.Substring(4).TrimStart();
             int userID = 0;
@@ -22,17 +22,17 @@ public async Task HandleCommand(string adminCommand, NetworkStream stream)
                     }
                 }
 
-                NetworkStream otherUserStream = Globals.clients[userID].stream;
+                Socket otherUserStream = Globals.clients[userID].playerClient;
 
                 UpdateUserType packet = new UpdateUserType();
 
-                await otherUserStream.WriteAsync(packet.SendPacket(0x00));
-                await otherUserStream.WriteAsync(GameMessage.SendPacket(255, "You're no longer op!"));
+                await otherUserStream.SendAsync(packet.SendPacket(0x00));
+                await otherUserStream.SendAsync(GameMessage.SendPacket(255, "You're no longer op!"));
                 Globals.clients[userID].UserType = 0x00;
             }
             else
             {
-                await stream.WriteAsync(GameMessage.SendPacket(255, "Unknown command!"));
+                await stream.SendAsync(GameMessage.SendPacket(255, "Unknown command!"));
             }
         }
     }

diff --git a/NetClassic/Commands/KickFunction.cs b/NetClassic/Commands/KickFunction.cs
@@ -5,7 +5,7 @@ namespace NetClassic
 {
     public class KickFunction : Commands
     {
-        public async Task HandleCommand(string adminCommand, NetworkStream stream)
+        public async Task HandleCommand(string adminCommand, Socket stream)
         {
             string getName = adminCommand.Substring(4).TrimStart();
             int userID = 0;
@@ -22,15 +22,15 @@ public async Task HandleCommand(string adminCommand, NetworkStream stream)
                     }
                 }
 
-                NetworkStream otherUserStream = Globals.clients[userID].stream;
+                Socket otherUserPlayer = Globals.clients[userID].playerClient;
 
                 DisconnectPlayer disconnectPacket = new DisconnectPlayer();
-                await otherUserStream.WriteAsync(disconnectPacket.SendPacket("You were kicked"));
-                Globals.clients[userID].Disconnect();
+                await otherUserPlayer.SendAsync(disconnectPacket.SendPacket("You were kicked"));
+                _ = Globals.clients[userID].Disconnect();
             }
             else
             {
-                await stream.WriteAsync(GameMessage.SendPacket(255, "Unknown command!"));
+                await stream.SendAsync(GameMessage.SendPacket(255, "Unknown command!"));
             }
         }
     }

diff --git a/NetClassic/Commands/OpFunction.cs b/NetClassic/Commands/OpFunction.cs
@@ -5,7 +5,7 @@ namespace NetClassic
 {
     public class OpFunction : Commands
     {
-        public async Task HandleCommand(string adminCommand, NetworkStream stream)
+        public async Task HandleCommand(string adminCommand, Socket stream)
         {
             string getName = adminCommand.Substring(2).TrimStart();
             int userID = 0;
@@ -22,17 +22,17 @@ public async Task HandleCommand(string adminCommand, NetworkStream stream)
                     }
                 }
 
-                NetworkStream otherUserStream = Globals.clients[userID].stream;
+                Socket otherUserStream = Globals.clients[userID].playerClient;
 
                 UpdateUserType packet = new UpdateUserType();
 
-                await otherUserStream.WriteAsync(packet.SendPacket(0x64));
-                await otherUserStream.WriteAsync(GameMessage.SendPacket(255, "You're now op!"));
+                await otherUserStream.SendAsync(packet.SendPacket(0x64));
+                await otherUserStream.SendAsync(GameMessage.SendPacket(255, "You're now op!"));
                 Globals.clients[userID].UserType = 0x64;
             }
             else
             {
-                await stream.WriteAsync(GameMessage.SendPacket(255, "Unknown command!"));
+                await stream.SendAsync(GameMessage.SendPacket(255, "Unknown command!"));
             }
         }
     }

diff --git a/NetClassic/Packets/03LevelDataChunk.cs b/NetClassic/Packets/03LevelDataChunk.cs
@@ -10,7 +10,7 @@ namespace NetClassic
 {
     public class LevelDataChunk : Packets
     {
-        public async Task SendPacket(NetworkStream stream)
+        public async Task SendPacket(Socket stream)
         {
             byte[] compressedData;
             using (MemoryStream compressedStream = new MemoryStream())
@@ -45,7 +45,7 @@ public async Task SendPacket(NetworkStream stream)
 
                     packet.WriteByte((byte)Math.Ceiling((double)i * 100 / compressedData.Length));
 
-                    await stream.WriteAsync(packet.ToArray());
+                    await stream.SendAsync(packet.ToArray());
                 }
             }
         }

diff --git a/NetClassic/Packets/05SetBlock.cs b/NetClassic/Packets/05SetBlock.cs
@@ -36,12 +36,20 @@ public byte[] SendPacket(short X, short Y, short Z, byte BlockType, byte Mode)
             {
                 ms.WriteByte(0);
                 Globals.world.BlockData[(Y * Globals.world.SizeZ + Z) * Globals.world.SizeX + X] = 0;
+                while(Globals.world.BlockData[(Y * Globals.world.SizeZ + Z) * Globals.world.SizeX + X] != 0)
+                {
+                    Globals.world.BlockData[(Y * Globals.world.SizeZ + Z) * Globals.world.SizeX + X] = 0;
+                }
             }
 
             if (Mode == 0x01)
             {
                 ms.WriteByte(BlockType);
                 Globals.world.BlockData[(Y * Globals.world.SizeZ + Z) * Globals.world.SizeX + X] = BlockType;
+                while(Globals.world.BlockData[(Y * Globals.world.SizeZ + Z) * Globals.world.SizeX + X] != BlockType)
+                {
+                    Globals.world.BlockData[(Y * Globals.world.SizeZ + Z) * Globals.world.SizeX + X] = BlockType;
+                }
             }
             return ms.ToArray();
         }