From ceff78a8212a9ee03b7d20d5ab4ff18d48589a8b Mon Sep 17 00:00:00 2001 From: mcflurrybaby Date: Sat, 2 Dec 2023 12:39:52 +0200 Subject: [PATCH] Restore ability to login with microsoft broken after yggdrasil login implementation --- MinecraftClient/Protocol/Handlers/Protocol16.cs | 3 ++- MinecraftClient/Protocol/Handlers/Protocol18.cs | 4 ++-- MinecraftClient/Protocol/Session/SessionToken.cs | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/MinecraftClient/Protocol/Handlers/Protocol16.cs b/MinecraftClient/Protocol/Handlers/Protocol16.cs index 411fae2e..39695e82 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol16.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol16.cs @@ -538,7 +538,8 @@ namespace MinecraftClient.Protocol.Handlers if (needCheckSession) { - if ((type == LoginType.mojang && ProtocolHandler.SessionCheck(uuid, sessionID, serverHash)) || (type == LoginType.yggdrasil && ProtocolHandler.YggdrasilSessionCheck(uuid, sessionID, serverHash))) + bool notYggdrasil = type == LoginType.mojang || type == LoginType.microsoft; + if ((notYggdrasil && ProtocolHandler.SessionCheck(uuid, sessionID, serverHash)) || (type == LoginType.yggdrasil && ProtocolHandler.YggdrasilSessionCheck(uuid, sessionID, serverHash))) { session.ServerIDhash = serverIDhash; session.ServerPublicKey = serverPublicKey; diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index ba942269..37114cde 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -2619,8 +2619,8 @@ namespace MinecraftClient.Protocol.Handlers if (needCheckSession) { string serverHash = CryptoHandler.GetServerHash(serverIDhash, serverPublicKey, secretKey); - - if ((type == LoginType.mojang && ProtocolHandler.SessionCheck(uuid, sessionID, serverHash) )|| (type == LoginType.yggdrasil && ProtocolHandler.YggdrasilSessionCheck(uuid, sessionID, serverHash))) + bool notYggdrasil = type == LoginType.mojang || type == LoginType.microsoft; + if ((notYggdrasil && ProtocolHandler.SessionCheck(uuid, sessionID, serverHash) )|| (type == LoginType.yggdrasil && ProtocolHandler.YggdrasilSessionCheck(uuid, sessionID, serverHash))) { session.ServerIDhash = serverIDhash; session.ServerPublicKey = serverPublicKey; diff --git a/MinecraftClient/Protocol/Session/SessionToken.cs b/MinecraftClient/Protocol/Session/SessionToken.cs index 66bcb568..ff965b70 100644 --- a/MinecraftClient/Protocol/Session/SessionToken.cs +++ b/MinecraftClient/Protocol/Session/SessionToken.cs @@ -39,7 +39,8 @@ namespace MinecraftClient.Protocol.Session return false; Crypto.CryptoHandler.ClientAESPrivateKey ??= Crypto.CryptoHandler.GenerateAESPrivateKey(); string serverHash = Crypto.CryptoHandler.GetServerHash(ServerIDhash, ServerPublicKey, Crypto.CryptoHandler.ClientAESPrivateKey); - if (type == LoginType.mojang && ProtocolHandler.SessionCheck(PlayerID, ID, serverHash)) + bool notYggdrasil = type == LoginType.mojang || type == LoginType.microsoft; + if (notYggdrasil && ProtocolHandler.SessionCheck(PlayerID, ID, serverHash)) return true; if (type == LoginType.yggdrasil && ProtocolHandler.YggdrasilSessionCheck(PlayerID, ID, serverHash)) return true;