testserver/Spigot-Server-Patches/0237-Avoid-NPE-in-Advanceme...

23 lines
1.0 KiB
Diff
Raw Normal View History

From 0dc45e0c967f8c83f88fee01e0175a4319b6c985 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Thu, 21 Sep 2017 07:00:43 -0700
Subject: [PATCH] Avoid NPE in AdvancementDataWorld thanks to Spigot being dumb
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 9ce3e1365..712fc1f9b 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -396,7 +396,7 @@ public class SpigotConfig
}
public static boolean disableAdvancementSaving;
- public static List<String> disabledAdvancements;
+ public static List<String> disabledAdvancements = java.util.Collections.emptyList(); // Paper - avoid NPE in AdvancementDataWorld
private static void disabledAdvancements() {
disableAdvancementSaving = getBoolean("advancements.disable-saving", false);
disabledAdvancements = getList("advancements.disabled", Arrays.asList(new String[]{"minecraft:story/disabled"}));
--
2.14.1