GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

remove unnecessary diff

Browse source
This commit is contained in:
onebeastchris 2024-07-18 12:10:28 +02:00
parent 2d80429093
commit e4e79406ae
3 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/org/geysermc/geyser/GeyserImpl.java
View file

@ -588,10 +588,8 @@ public class GeyserImpl implements GeyserApi {
);
String authChain = gson.toJson(javaSession.toJson(fullJavaSession));
GeyserImpl.getInstance().getLogger().warning("new auth chain: " + authChain);
savedAuthChains.put(user, authChain);
} catch (Exception e) {
GeyserImpl.getInstance().getLogger().severe(e.getMessage(), e);
GeyserImpl.getInstance().getLogger().warning("Could not migrate " + entry.getKey() + " to an auth chain! " +
"They will need to sign in the next time they join Geyser.");
}
@ -615,9 +613,9 @@ public class GeyserImpl implements GeyserApi {
} catch (IOException e) {
logger.error("Cannot load saved user tokens!", e);
}
boolean doWrite = false;
if (authChainFile != null) {
List<String> validUsers = config.getSavedUserLogins();
boolean doWrite = false;
for (Map.Entry<String, String> entry : authChainFile.entrySet()) {
String user = entry.getKey();
if (!validUsers.contains(user)) {

1
core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
View file

@ -863,6 +863,7 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
new GameProfile(mcProfile.getId(), mcProfile.getName()),
mcToken.getAccessToken()
);
try {
connectDownstream();
} catch (Throwable t) {

2
core/src/main/java/org/geysermc/geyser/session/PendingMicrosoftAuthentication.java
View file

@ -62,8 +62,6 @@ public class PendingMicrosoftAuthentication {
.withoutDeviceToken()
.regularAuthentication(MicrosoftConstants.JAVA_XSTS_RELYING_PARTY)
.buildMinecraftJavaProfileStep(false);
/**
* For GeyserConnect usage.
*/