From a3e4b75c5935df2ce6f5982a52000e14ca6a3dcd Mon Sep 17 00:00:00 2001 From: Take Weiland Date: Sat, 13 Jun 2020 00:36:00 +0200 Subject: [PATCH] Fix StartupQuery not working more than once on the client (#6699) --- src/main/java/net/minecraftforge/fml/StartupQuery.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/StartupQuery.java b/src/main/java/net/minecraftforge/fml/StartupQuery.java index d8d675e31..152e84dda 100644 --- a/src/main/java/net/minecraftforge/fml/StartupQuery.java +++ b/src/main/java/net/minecraftforge/fml/StartupQuery.java @@ -118,7 +118,6 @@ public class StartupQuery { MinecraftServer server = ServerLifecycleHooks.getCurrentServer(); if (server != null) server.initiateShutdown(false); - aborted = true; // to abort loading and go back to the main menu throw new AbortedException(); // to halt the server } @@ -128,7 +127,6 @@ public class StartupQuery { public static void reset() { pending = null; - aborted = false; } public static boolean check() @@ -156,7 +154,7 @@ public class StartupQuery { pending = null; } - return !aborted; + return true; } private void throwException() throws InterruptedException @@ -165,7 +163,6 @@ public class StartupQuery { } private static volatile StartupQuery pending; - private static volatile boolean aborted = false; private StartupQuery(String header, String text, String action, @Nullable AtomicBoolean result)