Fix fetching OnlineMode user data on login (#396)

ObsidianMC · Nov 15, 2023 · b97915f · b97915f
1 parent 63c15a8
commit b97915f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Obsidian/Client.cs b/Obsidian/Client.cs
@@ -423,7 +423,7 @@ private async Task HandleLoginStartAsync(byte[] data)
 
         if (config.OnlineMode)
         {
-            cachedUser = await UserCache.GetUserFromUuidAsync(loginStart.PlayerUuid ?? throw new NullReferenceException(nameof(loginStart.PlayerUuid)));
+            cachedUser = await UserCache.GetUserFromNameAsync(loginStart.Username ?? throw new NullReferenceException(nameof(loginStart.PlayerUuid)));
 
             if (cachedUser is null)
             {
@@ -436,7 +436,7 @@ private async Task HandleLoginStartAsync(byte[] data)
                 return;
             }
 
-            Player = new Player(loginStart.PlayerUuid ?? this.cachedUser.Id, loginStart.Username, this, world);
+            Player = new Player(this.cachedUser.Id, loginStart.Username, this, world);
             packetCryptography.GenerateKeyPair();
 
             var (publicKey, randomToken) = packetCryptography.GeneratePublicKeyAndToken();

diff --git a/Obsidian/Utilities/Mojang/MojangUser.cs b/Obsidian/Utilities/Mojang/MojangUser.cs
@@ -12,7 +12,7 @@ public sealed class MojangUser
 
     public bool? Demo { get; init; }
 
-    public required List<SkinProperty> Properties { get; init; }
+    public List<SkinProperty>? Properties { get; init; }
 }
 
 public sealed class CachedUser