File tree Expand file tree Collapse file tree
paper-server/patches/sources/net/minecraft/server Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1212 OptionParser parser = new OptionParser();
1313 OptionSpec<Void> nogui = parser.accepts("nogui");
1414 OptionSpec<Void> initSettings = parser.accepts("initSettings", "Initializes 'server.properties' and 'eula.txt', then quits");
15- @@ -89,39 +_,96 @@
15+ @@ -89,39 +_,95 @@
1616 parser.printHelpOn(System.err);
1717 return;
1818 }
7272 }
7373
7474- if (!eula.hasAgreedToEULA()) {
75- + // Spigot start
75+ + // Paper start - eula system property
7676+ boolean eulaAgreed = Boolean.getBoolean("com.mojang.eula.agree");
7777+ if (eulaAgreed) {
78- + LOGGER.error("You have used the Spigot command line EULA agreement flag.");
79- + LOGGER.error("By using this setting you are indicating your agreement to Mojang's EULA (https://aka.ms/MinecraftEULA).");
80- + LOGGER.error("If you do not agree to the above EULA please stop your server and remove this flag immediately.");
81- + }
82- + if (!eula.hasAgreedToEULA() && !eulaAgreed) {
83- + // Spigot end
78+ + LOGGER.warn("You have used the Paper command line EULA agreement flag.");
79+ + LOGGER.warn("By using this setting you are indicating your agreement to Mojang's EULA (https://aka.ms/MinecraftEULA).");
80+ + LOGGER.warn("If you do not agree to the above EULA please stop your server and remove this flag immediately.");
81+ + } else if (!eula.hasAgreedToEULA()) {
82+ + // Paper end - eula system property
8483 LOGGER.info("You need to agree to the EULA in order to run the server. Go to eula.txt for more info.");
8584 return;
8685 }
You can’t perform that action at this time.
0 commit comments