PaperMC/patches/server/0473-Optimize-the-advancement-data-player-iteration-to-be.patch

55 lines
2.4 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wyatt Childers <wchilders@nearce.com>
Date: Sat, 4 Jul 2020 23:07:43 -0400
Subject: [PATCH] Optimize the advancement data player iteration to be O(N)
rather than O(N^2)
diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
index ecd62d2625bc5def3ac68f642f2c6f156060f129..f8f0be77126d2f3a1c53f7405ce4de4f0dca42be 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
+++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
2021-06-14 11:46:59 +02:00
@@ -437,6 +437,16 @@ public class PlayerAdvancements {
2021-06-11 14:02:28 +02:00
}
private void ensureVisibility(Advancement advancement) {
+ // Paper start
2021-11-04 15:08:53 +01:00
+ ensureVisibility(advancement, IterationEntryPoint.ROOT);
2021-06-11 14:02:28 +02:00
+ }
+ private enum IterationEntryPoint {
+ ROOT,
+ ITERATOR,
+ PARENT_OF_ITERATOR
+ }
2021-11-04 15:08:53 +01:00
+ private void ensureVisibility(Advancement advancement, IterationEntryPoint entryPoint) {
2021-06-11 14:02:28 +02:00
+ // Paper end
boolean flag = this.shouldBeVisible(advancement);
boolean flag1 = this.visible.contains(advancement);
2021-06-14 11:46:59 +02:00
@@ -452,15 +462,23 @@ public class PlayerAdvancements {
2021-06-11 14:02:28 +02:00
}
if (flag != flag1 && advancement.getParent() != null) {
- this.ensureVisibility(advancement.getParent());
+ // Paper start - If we're not coming from an iterator consider this to be a root entry, otherwise
+ // market that we're entering from the parent of an iterator.
2021-11-04 15:08:53 +01:00
+ this.ensureVisibility(advancement.getParent(), entryPoint == IterationEntryPoint.ITERATOR ? IterationEntryPoint.PARENT_OF_ITERATOR : IterationEntryPoint.ROOT);
2021-06-11 14:02:28 +02:00
}
+ // If this is true, we've went through a child iteration, entered the parent, processed the parent
+ // and are about to reprocess the children. Stop processing here to prevent O(N^2) processing.
+ if (entryPoint == IterationEntryPoint.PARENT_OF_ITERATOR) {
+ return;
+ } // Paper end
+
Iterator iterator = advancement.getChildren().iterator();
while (iterator.hasNext()) {
Advancement advancement1 = (Advancement) iterator.next();
- this.ensureVisibility(advancement1);
2021-11-04 15:08:53 +01:00
+ this.ensureVisibility(advancement1, IterationEntryPoint.ITERATOR); // Paper - Mark this call as being from iteration
2021-06-11 14:02:28 +02:00
}
}