Skip to content

chore: Don't log errors for accepting the EULA via the system property #13681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kezz wants to merge 2 commits into
base: main
Choose a base branch
from
+5 −5
Open

chore: Don't log errors for accepting the EULA via the system property #13681

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
980762c
Don't log errors for accepting the EULA via the system property
kezz Mar 5, 2026
9a1321b
replace existing comments
kezz Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions paper-server/patches/sources/net/minecraft/server/Main.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
OptionParser optionParser = new OptionParser();
OptionSpec<Void> optionSpec = optionParser.accepts("nogui");
OptionSpec<Void> optionSpec1 = optionParser.accepts("initSettings", "Initializes 'server.properties' and 'eula.txt', then quits");
@@ -90,41 +_,94 @@
@@ -90,41 +_,96 @@
optionParser.printHelpOn(System.err);
return;
}
Expand Down Expand Up @@ -69,9 +69,11 @@
+ // Spigot start
+ boolean eulaAgreed = Boolean.getBoolean("com.mojang.eula.agree");
+ if (eulaAgreed) {
+ LOGGER.error("You have used the Spigot command line EULA agreement flag.");
+ LOGGER.error("By using this setting you are indicating your agreement to Mojang's EULA (https://aka.ms/MinecraftEULA).");
+ LOGGER.error("If you do not agree to the above EULA please stop your server and remove this flag immediately.");
+ // Paper start - not Spigot anymore and warn instead of error
+ LOGGER.warn("You have used the Paper command line EULA agreement flag.");
+ LOGGER.warn("By using this setting you are indicating your agreement to Mojang's EULA (https://aka.ms/MinecraftEULA).");
+ LOGGER.warn("If you do not agree to the above EULA please stop your server and remove this flag immediately.");
+ // Paper end - not Spigot anymore and warn instead of error
+ }
+ if (!eula.hasAgreedToEULA() && !eulaAgreed) {
Comment on lines 75 to 76
Copy link
Copy Markdown
Member

@Strokkur424 Strokkur424 Mar 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could maybe even put this into an else-if statement instead, might be cleaner.

Suggested change
+ }
+ if (!eula.hasAgreedToEULA() && !eulaAgreed) {
+ } else if (!eula.hasAgreedToEULA()) {

+ // Spigot end
Expand Down