aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorWilliam Blake Galbreath <[email protected]>2020-07-10 13:24:43 -0500
committerAikar <[email protected]>2020-07-22 01:38:36 -0400
commit282763b885c35030915414a1b63131e8d3cef0c9 (patch)
tree878bb0d8b324004079e9a290694bb1eb25718037
parent9b93d122ecdfc797de63a37152cffde8d55687cb (diff)
downloadPaper-282763b885c35030915414a1b63131e8d3cef0c9.tar.gz
Paper-282763b885c35030915414a1b63131e8d3cef0c9.zip
Fix SPIGOT-5885 Unable to disable advancements
-rw-r--r--Spigot-Server-Patches/0547-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch18
1 files changed, 18 insertions, 0 deletions
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 0000000000..3afadc516b
--- /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 <[email protected]>
+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");