From 980762c38cefd36e993e18144812d0957796b19b Mon Sep 17 00:00:00 2001 From: Kieran Wallbanks Date: Thu, 5 Mar 2026 16:40:26 +0000 Subject: [PATCH 1/2] Don't log errors for accepting the EULA via the system property --- .../sources/net/minecraft/server/Main.java.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/paper-server/patches/sources/net/minecraft/server/Main.java.patch b/paper-server/patches/sources/net/minecraft/server/Main.java.patch index 261d5d355c1c..93082ce4d737 100644 --- a/paper-server/patches/sources/net/minecraft/server/Main.java.patch +++ b/paper-server/patches/sources/net/minecraft/server/Main.java.patch @@ -12,7 +12,7 @@ OptionParser optionParser = new OptionParser(); OptionSpec optionSpec = optionParser.accepts("nogui"); OptionSpec optionSpec1 = optionParser.accepts("initSettings", "Initializes 'server.properties' and 'eula.txt', then quits"); -@@ -90,41 +_,94 @@ +@@ -90,41 +_,96 @@ optionParser.printHelpOn(System.err); return; } @@ -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) { + // Spigot end From 9a1321b658656affeabc2e79d0ca2d352656b6ac Mon Sep 17 00:00:00 2001 From: Kieran Wallbanks Date: Thu, 5 Mar 2026 16:53:36 +0000 Subject: [PATCH 2/2] replace existing comments --- .../patches/sources/net/minecraft/server/Main.java.patch | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/paper-server/patches/sources/net/minecraft/server/Main.java.patch b/paper-server/patches/sources/net/minecraft/server/Main.java.patch index 93082ce4d737..0ceb8abb23bd 100644 --- a/paper-server/patches/sources/net/minecraft/server/Main.java.patch +++ b/paper-server/patches/sources/net/minecraft/server/Main.java.patch @@ -12,7 +12,7 @@ OptionParser optionParser = new OptionParser(); OptionSpec optionSpec = optionParser.accepts("nogui"); OptionSpec optionSpec1 = optionParser.accepts("initSettings", "Initializes 'server.properties' and 'eula.txt', then quits"); -@@ -90,41 +_,96 @@ +@@ -90,41 +_,94 @@ optionParser.printHelpOn(System.err); return; } @@ -66,17 +66,15 @@ } - if (!eula.hasAgreedToEULA()) { -+ // Spigot start ++ // Paper start - eula system property + boolean eulaAgreed = Boolean.getBoolean("com.mojang.eula.agree"); + if (eulaAgreed) { -+ // 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) { -+ // Spigot end ++ // Paper end - eula system property LOGGER.info("You need to agree to the EULA in order to run the server. Go to eula.txt for more info."); return; }