1 files changed, 6 insertions, 10 deletions
diff --git a/NetClient.cs b/NetClient.cs
index ce7d8fe..da287df 100644
--- a/NetClient.cs
+++ b/NetClient.cs
@@ -36,12 +36,9 @@ class Client
             Console.WriteLine("Connected to the Server!");
             NetDataWriter writer = new();
             
-            writer.Put(new PacketInfo(PacketType.OnekoSpritesheet, Id));
-            writer.Put(OnekoLocal.Instance!.SpriteSheet.Serialize());
-            peer.Send(writer, DeliveryMethod.ReliableUnordered);
-
-            writer.ResetWithInfo(new PacketInfo(PacketType.Username, Id));
+            writer.Put(new PacketInfo(PacketType.UserInfo, Id));
             writer.Put(UserName);
+            writer.PutBytesWithLength(OnekoLocal.Instance!.SpriteSheet.Serialize());
             peer.Send(writer, DeliveryMethod.ReliableUnordered);
         };
 
@@ -74,14 +71,13 @@ class Client
                 return;
             }
 
-            else if (info.Type == PacketType.OnekoSpritesheet) from.SpriteSheet = reader.GetRemainingBytes();
-            else if (info.Type == PacketType.Username) from.Username = reader.GetString();
-
-            if (from.ExchangedData && !from.Initialized) {
-                //Announce user connection
+            else if (info.Type == PacketType.UserInfo) {
+                from.Username = reader.GetString();
+                from.SpriteSheet = reader.GetBytesWithLength();
                 Console.WriteLine($"User {from.Username} joined!");
                 from.Initialized = true;
                 UserConnected?.Invoke(from);
+                return;
             }
 
             NetDataReader newReader = new(reader.GetRemainingBytes());