mirror of
https://hub.spigotmc.org/stash/scm/spigot/spigot.git
synced 2025-09-18 21:33:01 +00:00
55 lines
2.8 KiB
Diff
55 lines
2.8 KiB
Diff
From 77c18017d6bb1c4d7cf99fba7aa4a2d535c84b61 Mon Sep 17 00:00:00 2001
|
|
From: md_5 <git@md-5.net>
|
|
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 e6497bae22..fbd4847950 100644
|
|
--- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
|
|
@@ -162,6 +162,7 @@ public class AdvancementDataPlayer {
|
|
}
|
|
|
|
public void save() {
|
|
+ if (org.spigotmc.SpigotConfig.disableAdvancementSaving) return; // Spigot
|
|
JsonElement jsonelement = (JsonElement) SystemUtils.getOrThrow(this.codec.encodeStart(JsonOps.INSTANCE, this.asData()), IllegalStateException::new);
|
|
|
|
try {
|
|
diff --git a/src/main/java/net/minecraft/server/AdvancementDataWorld.java b/src/main/java/net/minecraft/server/AdvancementDataWorld.java
|
|
index 334fb4f4c6..2356d8f1ee 100644
|
|
--- a/src/main/java/net/minecraft/server/AdvancementDataWorld.java
|
|
+++ b/src/main/java/net/minecraft/server/AdvancementDataWorld.java
|
|
@@ -46,6 +46,12 @@ public class AdvancementDataWorld extends ResourceDataJson {
|
|
Builder<MinecraftKey, AdvancementHolder> builder = ImmutableMap.builder();
|
|
|
|
map.forEach((minecraftkey, jsonelement) -> {
|
|
+ // Spigot start
|
|
+ if (org.spigotmc.SpigotConfig.disabledAdvancements != null && (org.spigotmc.SpigotConfig.disabledAdvancements.contains("*") || org.spigotmc.SpigotConfig.disabledAdvancements.contains(minecraftkey.toString()) || org.spigotmc.SpigotConfig.disabledAdvancements.contains(minecraftkey.getNamespace()))) {
|
|
+ return;
|
|
+ }
|
|
+ // Spigot end
|
|
+
|
|
try {
|
|
Advancement advancement = (Advancement) SystemUtils.getOrThrow(Advancement.CODEC.parse(JsonOps.INSTANCE, jsonelement), JsonParseException::new);
|
|
|
|
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
index b86000179d..b99e433523 100644
|
|
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
|
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
@@ -379,4 +379,11 @@ public class SpigotConfig
|
|
Bukkit.getLogger().info( "Debug logging is disabled" );
|
|
}
|
|
}
|
|
+
|
|
+ public static boolean disableAdvancementSaving;
|
|
+ public static List<String> disabledAdvancements;
|
|
+ private static void disabledAdvancements() {
|
|
+ disableAdvancementSaving = getBoolean("advancements.disable-saving", false);
|
|
+ disabledAdvancements = getList("advancements.disabled", Arrays.asList(new String[]{"minecraft:story/disabled"}));
|
|
+ }
|
|
}
|
|
--
|
|
2.43.0
|
|
|