mirror of
https://github.com/barkeser2002/CatServer.git
synced 2026-09-25 04:20:02 +03:00
34 lines
2.0 KiB
Diff
34 lines
2.0 KiB
Diff
--- ../src-base/minecraft/net/minecraft/advancements/AdvancementManager.java
|
|
+++ ../src-work/minecraft/net/minecraft/advancements/AdvancementManager.java
|
|
@@ -50,8 +50,8 @@
|
|
return Advancement.Builder.deserialize(jsonobject, p_deserialize_3_);
|
|
}
|
|
}).registerTypeAdapter(AdvancementRewards.class, new AdvancementRewards.Deserializer()).registerTypeHierarchyAdapter(ITextComponent.class, new ITextComponent.Serializer()).registerTypeHierarchyAdapter(Style.class, new Style.Serializer()).registerTypeAdapterFactory(new EnumTypeAdapterFactory()).create();
|
|
- private static final AdvancementList ADVANCEMENT_LIST = new AdvancementList();
|
|
- private final File advancementsDir;
|
|
+ public static final AdvancementList ADVANCEMENT_LIST = new AdvancementList();
|
|
+ public final File advancementsDir;
|
|
private boolean hasErrored;
|
|
|
|
public AdvancementManager(@Nullable File advancementsDirIn)
|
|
@@ -66,6 +66,7 @@
|
|
ADVANCEMENT_LIST.clear();
|
|
Map<ResourceLocation, Advancement.Builder> map = this.loadCustomAdvancements();
|
|
this.loadBuiltInAdvancements(map);
|
|
+ this.hasErrored |= net.minecraftforge.common.ForgeHooks.loadAdvancements(map);
|
|
ADVANCEMENT_LIST.loadAdvancements(map);
|
|
|
|
for (Advancement advancement : ADVANCEMENT_LIST.getRoots())
|
|
@@ -172,6 +173,11 @@
|
|
Path path2 = path.relativize(path1);
|
|
String s = FilenameUtils.removeExtension(path2.toString()).replaceAll("\\\\", "/");
|
|
ResourceLocation resourcelocation = new ResourceLocation("minecraft", s);
|
|
+ // Spigot start
|
|
+ if (org.spigotmc.SpigotConfig.disabledAdvancements != null && (org.spigotmc.SpigotConfig.disabledAdvancements.contains("*") || org.spigotmc.SpigotConfig.disabledAdvancements.contains(resourcelocation.toString()))) {
|
|
+ continue;
|
|
+ }
|
|
+ // Spigot end
|
|
|
|
if (!map.containsKey(resourcelocation))
|
|
{
|