Properly error if Microsoft authentication sends an error

This commit is contained in:
Camotoy 2021-09-08 10:13:46 -04:00
parent d602d820dd
commit 95ba2a10ad
No known key found for this signature in database
GPG Key ID: 7EEFB66FE798081F
2 changed files with 3 additions and 2 deletions

View File

@ -143,7 +143,7 @@
<dependency> <dependency>
<groupId>com.github.GeyserMC</groupId> <groupId>com.github.GeyserMC</groupId>
<artifactId>MCAuthLib</artifactId> <artifactId>MCAuthLib</artifactId>
<version>0e48a094f2</version> <version>6c99331</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

View File

@ -658,7 +658,8 @@ public class GeyserSession implements CommandSender {
connectDownstream(); connectDownstream();
} catch (RequestException e) { } catch (RequestException e) {
if (!(e instanceof AuthPendingException)) { if (!(e instanceof AuthPendingException)) {
throw new RuntimeException("Failed to log in with Microsoft code!", e); connector.getLogger().error("Failed to log in with Microsoft code!", e);
disconnect(e.toString());
} else { } else {
// Wait one second before trying again // Wait one second before trying again
connector.getGeneralThreadPool().schedule(() -> attemptCodeAuthentication(msaAuthenticationService), 1, TimeUnit.SECONDS); connector.getGeneralThreadPool().schedule(() -> attemptCodeAuthentication(msaAuthenticationService), 1, TimeUnit.SECONDS);