From 58626d1a2296f8e23e47bdb6b16cc57952f6665c Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 15 Mar 2023 11:41:12 -0700 Subject: [PATCH] Fix advancements not loading, bug seems to be fixed by vanilla now. Closes #9384 --- .../minecraft/advancements/AdvancementList.java.patch | 10 ---------- .../net/minecraft/server/PlayerAdvancements.java.patch | 10 ---------- .../java/net/minecraftforge/common/ForgeConfig.java | 6 ------ 3 files changed, 26 deletions(-) delete mode 100644 patches/minecraft/net/minecraft/advancements/AdvancementList.java.patch diff --git a/patches/minecraft/net/minecraft/advancements/AdvancementList.java.patch b/patches/minecraft/net/minecraft/advancements/AdvancementList.java.patch deleted file mode 100644 index 80436c26c0..0000000000 --- a/patches/minecraft/net/minecraft/advancements/AdvancementList.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/net/minecraft/advancements/AdvancementList.java -+++ b/net/minecraft/advancements/AdvancementList.java -@@ -90,6 +_,7 @@ - } - } - -+ net.minecraftforge.common.AdvancementLoadFix.buildSortedTrees(this.f_139327_); - f_139325_.info("Loaded {} advancements", (int)this.f_139326_.size()); - } - diff --git a/patches/minecraft/net/minecraft/server/PlayerAdvancements.java.patch b/patches/minecraft/net/minecraft/server/PlayerAdvancements.java.patch index 209564de68..2eca9af311 100644 --- a/patches/minecraft/net/minecraft/server/PlayerAdvancements.java.patch +++ b/patches/minecraft/net/minecraft/server/PlayerAdvancements.java.patch @@ -32,13 +32,3 @@ } if (flag1 && !advancementprogress.m_8193_()) { -@@ -253,6 +_,9 @@ - Set set = new HashSet<>(); - Set set1 = new HashSet<>(); - -+ if (net.minecraftforge.common.ForgeConfig.SERVER.fixAdvancementLoading.get()) -+ net.minecraftforge.common.AdvancementLoadFix.loadVisibility(this, this.f_135965_, this.f_263821_, this.f_263740_, this.f_135967_, advancement -> AdvancementVisibilityEvaluator.isVisible(advancement, adv -> m_135996_(adv).m_8193_())); -+ else - for(Advancement advancement : this.f_263821_) { - this.m_264265_(advancement, set, set1); - } diff --git a/src/main/java/net/minecraftforge/common/ForgeConfig.java b/src/main/java/net/minecraftforge/common/ForgeConfig.java index 2f4440010e..a02b69260c 100644 --- a/src/main/java/net/minecraftforge/common/ForgeConfig.java +++ b/src/main/java/net/minecraftforge/common/ForgeConfig.java @@ -28,8 +28,6 @@ public class ForgeConfig { public final DoubleValue zombieBaseSummonChance; public final DoubleValue zombieBabyChance; - public final BooleanValue fixAdvancementLoading; - public final ConfigValue permissionHandler; Server(ForgeConfigSpec.Builder builder) { @@ -65,10 +63,6 @@ public class ForgeConfig { .translation("forge.configgui.zombieBabyChance") .worldRestart() .defineInRange("zombieBabyChance", 0.05D, 0.0D, 1.0D); - fixAdvancementLoading = builder - .comment("Fix advancement loading to use a proper topological sort. This may have visibility side-effects and can thus be turned off if needed for data-pack compatibility.") - .translation("forge.configgui.fixAdvancementLoading") - .define("fixAdvancementLoading", true); permissionHandler = builder .comment("The permission handler used by the server. Defaults to forge:default_handler if no such handler with that name is registered.")