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

Fix two null issues

Browse source
This commit is contained in:
AlexProgrammerDE 2024-07-01 15:42:28 +02:00
parent 07522a7d8f
commit 517a69e891
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -766,7 +766,7 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
final PendingMicrosoftAuthentication.AuthenticationTask task = geyser.getPendingMicrosoftAuthentication().getOrCreateTask(
getAuthData().xuid()
);
if (task.getAuthentication().isDone()) {
if (task.getAuthentication() != null && task.getAuthentication().isDone()) {
onMicrosoftLoginComplete(task);
} else {
task.resetRunningFlow();

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

@ -105,6 +105,10 @@ public class PendingMicrosoftAuthentication {
}
public void resetRunningFlow() {
if (authentication == null) {
return;
}
// Interrupt the current flow
this.authentication.cancel(true);
}