From d558b8a81c5da66fd54bff7caae2c3bce0d9a574 Mon Sep 17 00:00:00 2001 From: MrFishCakes Date: Wed, 6 Sep 2023 21:05:32 +0100 Subject: [PATCH] Global EULA --- patches/server/0014-Global-EULA.patch | 58 +++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 patches/server/0014-Global-EULA.patch diff --git a/patches/server/0014-Global-EULA.patch b/patches/server/0014-Global-EULA.patch new file mode 100644 index 0000000..9c5d95c --- /dev/null +++ b/patches/server/0014-Global-EULA.patch @@ -0,0 +1,58 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MrFishCakes +Date: Wed, 6 Sep 2023 21:00:48 +0100 +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 +--- 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 { + DedicatedServerSettings dedicatedserversettings = new DedicatedServerSettings(optionset); // CraftBukkit - CLI argument support + + dedicatedserversettings.forceSave(); +- Path path2 = Paths.get("eula.txt"); ++ Path path2 = Paths.get(dedicatedserversettings.getProperties().useGlobalEula ? dedicatedserversettings.getProperties().globalEulaPath : "eula.txt"); // Graphite - Global EULA + 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")); +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 +--- 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