diff --git a/patches/server/0014-Global-EULA.patch b/patches/server/0014-Global-EULA.patch index 9c5d95c..88744e2 100644 --- a/patches/server/0014-Global-EULA.patch +++ b/patches/server/0014-Global-EULA.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Global EULA Allows server owners to user a single global EULA file diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index dae36c6452ccd57a436dd918547b64d59957ab0a..3013ddf8e2ddb06abd08a36d80a3894f424b4c4a 100644 +index dae36c6452ccd57a436dd918547b64d59957ab0a..8b6581b9d51479f082d2e80bd9141ba386e6c966 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java @@ -131,7 +131,7 @@ public class Main { @@ -18,8 +18,25 @@ index dae36c6452ccd57a436dd918547b64d59957ab0a..3013ddf8e2ddb06abd08a36d80a3894f Eula eula = new Eula(path2); // Paper start - load config files for access below if needed org.bukkit.configuration.file.YamlConfiguration bukkitConfiguration = io.papermc.paper.configuration.PaperConfigurations.loadLegacyConfigFile((File) optionset.valueOf("bukkit-settings")); +@@ -169,7 +169,15 @@ public class Main { + Main.LOGGER.info("You need to agree to the EULA in order to run the server. Go to eula.txt for more info."); + return; + } +- ++ // Graphite start - Global EULA ++ if (dedicatedserversettings.getProperties().useGlobalEula) { ++ Main.LOGGER.warn(""); ++ Main.LOGGER.warn("You are using Graphite's global EULA feature."); ++ Main.LOGGER.warn("By using this setting you are indicating your agreement to Mojang's EULA (https://account.mojang.com/documents/minecraft_eula)."); ++ Main.LOGGER.warn("If you do not agree to the above EULA please stop your server and disable the feature immediately."); ++ Main.LOGGER.warn(""); ++ } ++ // Graphite end - Global EULA + // Paper start - Warn on headless + String awtException = io.papermc.paper.util.ServerEnvironment.awtDependencyCheck(); + if (awtException != null) { diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java -index 1ea3012995c738c67b31e997c138f824f9e69ba1..45be14d14fa8f35405d0074d587d98b1fa39f2ee 100644 +index 1ea3012995c738c67b31e997c138f824f9e69ba1..a8dbacde957228dda9d0faa09a67a3f6ac3c05c6 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java @@ -110,6 +110,10 @@ public class DedicatedServerProperties extends Settings