mirror of
https://github.com/GeyserMC/Geyser.git
synced 2024-08-14 23:57:35 +00:00
Go back to normal thread for now using MSA auth, and only toggle leak detector on standalone
This commit is contained in:
parent
ae4e4397e3
commit
39324ce95d
2 changed files with 5 additions and 8 deletions
|
@ -126,7 +126,7 @@ public class GeyserConnector {
|
|||
private Metrics metrics;
|
||||
|
||||
private GeyserConnector(PlatformType platformType, GeyserBootstrap bootstrap) {
|
||||
if (System.getProperty("io.netty.leakDetection.level") == null) {
|
||||
if (platformType == PlatformType.STANDALONE && System.getProperty("io.netty.leakDetection.level") == null) {
|
||||
ResourceLeakDetector.setLevel(ResourceLeakDetector.Level.DISABLED); // Can eat performance
|
||||
}
|
||||
|
||||
|
|
|
@ -609,10 +609,8 @@ public class GeyserSession implements CommandSender {
|
|||
}
|
||||
|
||||
loggingIn = true;
|
||||
|
||||
// Use a future to prevent timeouts as all the authentication is handled sync
|
||||
// This will be changed with the new protocol library.
|
||||
CompletableFuture.supplyAsync(() -> {
|
||||
// new thread so clients don't timeout
|
||||
new Thread(() -> {
|
||||
try {
|
||||
MsaAuthenticationService msaAuthenticationService = new MsaAuthenticationService(GeyserConnector.OAUTH_CLIENT_ID);
|
||||
|
||||
|
@ -632,8 +630,7 @@ public class GeyserSession implements CommandSender {
|
|||
} catch (RequestException ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
return null;
|
||||
}).whenComplete((aVoid, ex) -> connectDownstream());
|
||||
}).start();
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -650,7 +647,7 @@ public class GeyserSession implements CommandSender {
|
|||
connectDownstream();
|
||||
} catch (RequestException e) {
|
||||
if (!(e instanceof AuthPendingException)) {
|
||||
e.printStackTrace();
|
||||
throw new RuntimeException("Failed to log in with Microsoft code!", e);
|
||||
} else {
|
||||
// Wait one second before trying again
|
||||
connector.getGeneralThreadPool().schedule(() -> attemptCodeAuthentication(msaAuthenticationService), 1, TimeUnit.SECONDS);
|
||||
|
|
Loading…
Reference in a new issue