Index: src/main/java/net/minecraft/server/MinecraftServer.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java (revision 80e88864c308ef9c8481a5d5af2ec1bda862fa6d) +++ b/src/main/java/net/minecraft/server/MinecraftServer.java (revision 74b59be6f63fa4b23e3d93746b36a4a33352a918) @@ -1162,28 +1162,8 @@ DedicatedServerSettings dedicatedserversettings = new DedicatedServerSettings(optionset); // CraftBukkit - CLI argument support dedicatedserversettings.save(); - java.nio.file.Path java_nio_file_path1 = Paths.get("eula.txt"); - EULA eula = new EULA(java_nio_file_path1); - - if (optionset.has("initSettings")) { // CraftBukkit - MinecraftServer.LOGGER.info("Initialized '" + java_nio_file_path.toAbsolutePath().toString() + "' and '" + java_nio_file_path1.toAbsolutePath().toString() + "'"); - return; - } // Spigot Start - boolean eulaAgreed = Boolean.getBoolean( "com.mojang.eula.agree" ); - if ( eulaAgreed ) - { - System.err.println( "You have used the Spigot command line EULA agreement flag." ); - System.err.println( "By using this setting you are indicating your agreement to Mojang's EULA (https://account.mojang.com/documents/minecraft_eula)." ); - System.err.println( "If you do not agree to the above EULA please stop your server and remove this flag immediately." ); - } - // Spigot End - if (!eula.a() && !eulaAgreed) { // Spigot - MinecraftServer.LOGGER.info("You need to agree to the EULA in order to run the server. Go to eula.txt for more info."); - return; - } - CrashReport.h(); DispenserRegistry.init(); DispenserRegistry.c(); @@ -2075,7 +2055,8 @@ } private void bb() { - Block.REGISTRY_ID.forEach(IBlockData::c); + Thread blockRegistry = new Thread(() -> Block.REGISTRY_ID.forEach(IBlockData::c)); + blockRegistry.start(); } // CraftBukkit start