From 53fc8c2b4fd2a5e807234456c1f95e97e1b6d572 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 10 Jul 2020 12:41:23 -0500 Subject: [PATCH] Fix SPIGOT-5885 Unable to disable advancements --- ...-5885-Unable-to-disable-advancements.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 patches/server/0105-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0105-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0105-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch new file mode 100644 index 000000000..59b6b063b --- /dev/null +++ b/patches/server/0105-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch @@ -0,0 +1,26 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: William Blake Galbreath +Date: Fri, 10 Jul 2020 12:38:12 -0500 +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 +--- 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 { + return; + } + ++ // Purpur start - fix SPIGOT-5885 ++ try { ++ org.spigotmc.SpigotConfig.disabledAdvancements = org.bukkit.configuration.file.YamlConfiguration ++ .loadConfiguration((File) optionset.valueOf("spigot-settings")) ++ .getStringList("advancements.disabled"); ++ } catch (Exception ignore) { ++ } ++ // Purpur end - fix SPIGOT-5885 ++ + File file = (File) optionset.valueOf("universe"); // CraftBukkit + YggdrasilAuthenticationService yggdrasilauthenticationservice = new com.destroystokyo.paper.profile.PaperAuthenticationService(Proxy.NO_PROXY, UUID.randomUUID().toString()); // Paper + MinecraftSessionService minecraftsessionservice = yggdrasilauthenticationservice.createMinecraftSessionService();