From 517a69e891a235704ea046261abe810b0f6f7243 Mon Sep 17 00:00:00 2001
From: AlexProgrammerDE <40795980+AlexProgrammerDE@users.noreply.github.com>
Date: Mon, 1 Jul 2024 15:42:28 +0200
Subject: [PATCH] Fix two null issues

---
 .../main/java/org/geysermc/geyser/session/GeyserSession.java  | 2 +-
 .../geyser/session/PendingMicrosoftAuthentication.java        | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
index a102a286c..966a47c47 100644
--- a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
+++ b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
@@ -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();
diff --git a/core/src/main/java/org/geysermc/geyser/session/PendingMicrosoftAuthentication.java b/core/src/main/java/org/geysermc/geyser/session/PendingMicrosoftAuthentication.java
index 11d0b35be..97012572c 100644
--- a/core/src/main/java/org/geysermc/geyser/session/PendingMicrosoftAuthentication.java
+++ b/core/src/main/java/org/geysermc/geyser/session/PendingMicrosoftAuthentication.java
@@ -105,6 +105,10 @@ public class PendingMicrosoftAuthentication {
         }
 
         public void resetRunningFlow() {
+            if (authentication == null) {
+                return;
+            }
+
             // Interrupt the current flow
             this.authentication.cancel(true);
         }