From c55484adeeefe4e43d063240f6a4f85e51ac06b9 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 9 Jun 2017 16:29:31 +1000 Subject: [PATCH] Configurable Advancement Disabling Allow disabling any (or all) inbuilt advancements with a configuration option. diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java index c3e329ff7..eff958932 100644 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java @@ -201,6 +201,7 @@ public class AdvancementDataPlayer { } public void c() { + if (org.spigotmc.SpigotConfig.disableAdvancementSaving) return; HashMap hashmap = Maps.newHashMap(); Iterator iterator = this.data.entrySet().iterator(); diff --git a/src/main/java/net/minecraft/server/AdvancementDataWorld.java b/src/main/java/net/minecraft/server/AdvancementDataWorld.java index 47279ebfd..5a49181bc 100644 --- a/src/main/java/net/minecraft/server/AdvancementDataWorld.java +++ b/src/main/java/net/minecraft/server/AdvancementDataWorld.java @@ -50,6 +50,11 @@ public class AdvancementDataWorld implements IResourcePackListener { try { IResource iresource = iresourcemanager.a(minecraftkey); Throwable throwable = null; + // Spigot start + if (org.spigotmc.SpigotConfig.disabledAdvancements != null && (org.spigotmc.SpigotConfig.disabledAdvancements.contains("*") || org.spigotmc.SpigotConfig.disabledAdvancements.contains(minecraftkey.toString()))) { + continue; + } + // Spigot end try { Advancement.SerializedAdvancement advancement_serializedadvancement = (Advancement.SerializedAdvancement) ChatDeserializer.a(AdvancementDataWorld.DESERIALIZER, IOUtils.toString(iresource.b(), StandardCharsets.UTF_8), Advancement.SerializedAdvancement.class); diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java index f941937a1..9b40db46c 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -385,4 +385,11 @@ public class SpigotConfig Bukkit.getLogger().info( "Debug logging is disabled" ); } } + + public static boolean disableAdvancementSaving; + public static List disabledAdvancements; + private static void disabledAdvancements() { + disableAdvancementSaving = getBoolean("advancements.disable-saving", false); + disabledAdvancements = getList("advancements.disabled", Arrays.asList(new String[]{"minecraft:story/disabled"})); + } } -- 2.17.1