make sure Legacy4JData isn't null when reading from it

Jab125 · Oct 17, 2024 · c8cd3a0 · c8cd3a0
1 parent 85e289a
commit c8cd3a0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/dev/jab125/hotjoin/compat/legacy4j/Legacy4JModCompat.java b/src/main/java/dev/jab125/hotjoin/compat/legacy4j/Legacy4JModCompat.java
@@ -67,7 +67,7 @@ public static void openLegacy4JUserPicker() {
 	}
 
 	public static void openLegacy4JUserPicker(Legacy4JData data) {
-		ScreenUtil.getLegacyOptions().selectedController().set(data.controllerIndex());
+		if (data != null) ScreenUtil.getLegacyOptions().selectedController().set(data.controllerIndex());
 		ChooseUserScreen chooseUserScreen = new ChooseUserScreen(null);
 		((AuthCallback)chooseUserScreen).hotjoin$authResponse(s -> {
 			Minecraft.getInstance().getToasts().addToast(new LegacyTip(Component.literal("Success, joining world...")));
@@ -156,7 +156,7 @@ public void onBeginScreenSet(Screen previousScreen, Screen newScreen) {
 			if (newScreen instanceof ConfirmationScreen) {
 
 			} else {
-				ScreenUtil.getLegacyOptions().selectedController().set(o.oldControllerIndex());
+				if (o != null) ScreenUtil.getLegacyOptions().selectedController().set(o.oldControllerIndex());
 			}
 		}
 	}