From cf1410403ee716b2c9037161e30d8d132d12bd95 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 10 Jul 2020 16:08:40 -0500 Subject: [PATCH] Call load() directly to avoid Bukkit logger --- ...4-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch | 8 ++++---- ...x-SPIGOT-5824-Bukkit-world-container-is-not-used.patch | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/patches/server/0104-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0104-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch index 59b6b063b..b073d1daf 100644 --- a/patches/server/0104-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch +++ b/patches/server/0104-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5885 Unable to disable advancements diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index 2f29d7040..21d4c965d 100644 +index 2f29d7040..719c9db3c 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java @@ -86,6 +86,15 @@ public class Main { @@ -14,9 +14,9 @@ index 2f29d7040..21d4c965d 100644 + // Purpur start - fix SPIGOT-5885 + try { -+ org.spigotmc.SpigotConfig.disabledAdvancements = org.bukkit.configuration.file.YamlConfiguration -+ .loadConfiguration((File) optionset.valueOf("spigot-settings")) -+ .getStringList("advancements.disabled"); ++ org.bukkit.configuration.file.YamlConfiguration config = new org.bukkit.configuration.file.YamlConfiguration(); ++ config.load((File) optionset.valueOf("spigot-settings")); ++ org.spigotmc.SpigotConfig.disabledAdvancements = config.getStringList("advancements.disabled"); + } catch (Exception ignore) { + } + // Purpur end - fix SPIGOT-5885 diff --git a/patches/server/0106-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0106-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch index afa34488a..6bda68e8f 100644 --- a/patches/server/0106-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch +++ b/patches/server/0106-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5824 Bukkit world-container is not used diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index 21d4c965d..220a084be 100644 +index 719c9db3c..5071fd1cd 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java @@ -95,7 +95,20 @@ public class Main { @@ -19,9 +19,9 @@ index 21d4c965d..220a084be 100644 + file = (File) optionset.valueOf("universe"); // CraftBukkit + } else { + try { -+ file = new File(org.bukkit.configuration.file.YamlConfiguration -+ .loadConfiguration((File) optionset.valueOf("bukkit-settings")) -+ .getString("settings.world-container", ".")); ++ org.bukkit.configuration.file.YamlConfiguration config = new org.bukkit.configuration.file.YamlConfiguration(); ++ config.load((File) optionset.valueOf("bukkit-settings")); ++ file = new File(config.getString("settings.world-container", ".")); + } catch (Exception ignore) { + file = new File("."); + }