Make advancement ordering predictable (#12292)

FaintLocket424 · web-flow · commit 894631f0d091 · 2025-03-21T17:52:42.000+01:00
diff --git a/paper-server/patches/sources/net/minecraft/server/PlayerAdvancements.java.patch b/paper-server/patches/sources/net/minecraft/server/PlayerAdvancements.java.patch
@@ -67,3 +67,12 @@
                      }
                  });
              }
+@@ -247,7 +_,7 @@
+     public void flushDirty(ServerPlayer serverPlayer) {
+         if (this.isFirstPacket || !this.rootsToUpdate.isEmpty() || !this.progressChanged.isEmpty()) {
+             Map<ResourceLocation, AdvancementProgress> map = new HashMap<>();
+-            Set<AdvancementHolder> set = new HashSet<>();
++            Set<AdvancementHolder> set = new java.util.TreeSet<>(java.util.Comparator.comparing(adv -> adv.id().toString())); // Paper - Changed from HashSet to TreeSet ordered alphabetically.
+             Set<ResourceLocation> set1 = new HashSet<>();
+ 
+             for (AdvancementNode advancementNode : this.rootsToUpdate) {

Original file line number	Diff line number	Diff line change
`@@ -67,3 +67,12 @@`
`67`	`67`	`}`
`68`	`68`	`});`
`69`	`69`	`}`
	`70`	`+@@ -247,7 +_,7 @@`
	`71`	`+ public void flushDirty(ServerPlayer serverPlayer) {`
	`72`	`+ if (this.isFirstPacket \|\| !this.rootsToUpdate.isEmpty() \|\| !this.progressChanged.isEmpty()) {`
	`73`	`+ Map<ResourceLocation, AdvancementProgress> map = new HashMap<>();`
	`74`	`+- Set<AdvancementHolder> set = new HashSet<>();`
	`75`	`++ Set<AdvancementHolder> set = new java.util.TreeSet<>(java.util.Comparator.comparing(adv -> adv.id().toString())); // Paper - Changed from HashSet to TreeSet ordered alphabetically.`
	`76`	`+ Set<ResourceLocation> set1 = new HashSet<>();`
	`77`	`+`
	`78`	`+ for (AdvancementNode advancementNode : this.rootsToUpdate) {`