From 282763b885c35030915414a1b63131e8d3cef0c9 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 10 Jul 2020 13:24:43 -0500
Subject: [PATCH] Fix SPIGOT-5885 Unable to disable advancements

---
 ...T-5885-Unable-to-disable-advancements.patch | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 Spigot-Server-Patches/0547-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch

diff --git a/Spigot-Server-Patches/0547-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/Spigot-Server-Patches/0547-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
new file mode 100644
index 000000000..3afadc516
--- /dev/null
+++ b/Spigot-Server-Patches/0547-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
@@ -0,0 +1,18 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <Blake.Galbreath@GMail.com>
+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 fcd735098f3f818e68d2d80dab679e8789573e6b..c426d1ed14177326c774d44c248f38229b3ad5be 100644
+--- a/src/main/java/net/minecraft/server/Main.java
++++ b/src/main/java/net/minecraft/server/Main.java
+@@ -92,6 +92,7 @@ public class Main {
+                 return;
+             }
+ 
++            org.spigotmc.SpigotConfig.disabledAdvancements = spigotConfiguration.getStringList("advancements.disabled"); // Paper - fix SPIGOT-5885, must be set early in init
+             // Paper start - fix SPIGOT-5824
+             File file;
+             File userCacheFile = new File("usercache.json");