Fix advancements not loading, bug seems to be fixed by vanilla now. Closes #9384

This commit is contained in:
LexManos committed 2023-03-15 11:41:12 -07:00
1 parent 631e72f99d
commit 58626d1a22
3 files changed
-26

No files matched your search

@@ -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());
}
@@ -32,13 +32,3 @@
}
if (flag1 && !advancementprogress.m_8193_()) {
@@ -253,6 +_,9 @@
Set<Advancement> set = new HashSet<>();
Set<ResourceLocation> 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);
}
@@ -28,8 +28,6 @@ public class ForgeConfig {
public final DoubleValue zombieBaseSummonChance;
public final DoubleValue zombieBabyChance;
public final BooleanValue fixAdvancementLoading;
public final ConfigValue<String> 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.")