Added null checks

RaphiMC · Nov 13, 2023 · 4211d88 · 4211d88
1 parent 97014f8
commit 4211d88
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/net/raphimc/minecraftauth/step/bedrock/session/StepFullBedrockSession.java b/src/main/java/net/raphimc/minecraftauth/step/bedrock/session/StepFullBedrockSession.java
@@ -41,8 +41,8 @@ public FullBedrockSession applyStep(final HttpClient httpClient, final StepMCCha
 
     @Override
     protected FullBedrockSession fromDeduplicatedJson(final JsonObject json) {
-        final StepMCChain.MCChain mcChain = this.prevStep.fromJson(json.getAsJsonObject("mcChain"));
-        final StepPlayFabToken.PlayFabToken playFabToken = this.prevStep2.fromJson(json.getAsJsonObject("playFabToken"));
+        final StepMCChain.MCChain mcChain = this.prevStep != null ? this.prevStep.fromJson(json.getAsJsonObject("mcChain")) : null;
+        final StepPlayFabToken.PlayFabToken playFabToken = this.prevStep2 != null ? this.prevStep2.fromJson(json.getAsJsonObject("playFabToken")) : null;
         return new FullBedrockSession(mcChain, playFabToken);
     }
 

diff --git a/src/main/java/net/raphimc/minecraftauth/step/java/session/StepFullJavaSession.java b/src/main/java/net/raphimc/minecraftauth/step/java/session/StepFullJavaSession.java
@@ -41,8 +41,8 @@ public FullJavaSession applyStep(final HttpClient httpClient, final StepMCProfil
 
     @Override
     protected FullJavaSession fromDeduplicatedJson(final JsonObject json) {
-        final StepMCProfile.MCProfile mcProfile = this.prevStep.fromJson(json.getAsJsonObject("mcProfile"));
-        final StepPlayerCertificates.PlayerCertificates playerCertificates = this.prevStep2.fromJson(json.getAsJsonObject("playerCertificates"));
+        final StepMCProfile.MCProfile mcProfile = this.prevStep != null ? this.prevStep.fromJson(json.getAsJsonObject("mcProfile")) : null;
+        final StepPlayerCertificates.PlayerCertificates playerCertificates = this.prevStep2 != null ? this.prevStep2.fromJson(json.getAsJsonObject("playerCertificates")) : null;
         return new FullJavaSession(mcProfile, playerCertificates);
     }
 

diff --git a/src/main/java/net/raphimc/minecraftauth/step/xbl/session/StepFullXblSession.java b/src/main/java/net/raphimc/minecraftauth/step/xbl/session/StepFullXblSession.java
@@ -42,7 +42,7 @@ public FullXblSession applyStep(final HttpClient httpClient, final StepXblUserTo
 
     @Override
     protected FullXblSession fromDeduplicatedJson(final JsonObject json) {
-        final StepXblUserToken.XblUserToken xblUserToken = this.prevStep.fromJson(json.getAsJsonObject("xblUserToken"));
+        final StepXblUserToken.XblUserToken xblUserToken = this.prevStep != null ? this.prevStep.fromJson(json.getAsJsonObject("xblUserToken")) : null;
         final StepXblTitleToken.XblTitleToken xblTitleToken = this.prevStep2 != null ? this.prevStep2.fromJson(json.getAsJsonObject("xblTitleToken")) : null;
         return new FullXblSession(xblUserToken, xblTitleToken);
     }