[ci skip] rebuild patches

This commit is contained in:
Jake Potrebic
2023-03-23 14:57:03 -07:00
parent 39255145b6
commit 0adc18baf8
60 changed files with 1113 additions and 1197 deletions

View File

@@ -137,12 +137,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- public AdvancementDisplay getDisplay() {
- if (this.handle.getDisplay() == null) {
- return null;
- }
-
- return new CraftAdvancementDisplay(this.handle.getDisplay());
+ public io.papermc.paper.advancement.AdvancementDisplay getDisplay() {
+ return this.handle.getDisplay() == null ? null : this.handle.getDisplay().paper;
}
+ }
+
+ @Deprecated @io.papermc.paper.annotation.DoNotUse
+ public AdvancementDisplay getDisplay0() { // May be called by plugins via Commodore
@@ -164,10 +161,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ final var children = com.google.common.collect.ImmutableList.<org.bukkit.advancement.Advancement>builder();
+ for (Advancement advancement : this.handle.getChildren()) {
+ children.add(advancement.bukkit);
+ }
}
+ return children.build();
+ }
+
- return new CraftAdvancementDisplay(this.handle.getDisplay());
+ @Override
+ public org.bukkit.advancement.Advancement getRoot() {
+ Advancement advancement = this.handle;
@@ -175,7 +173,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ advancement = advancement.getParent();
+ }
+ return advancement.bukkit;
+ }
}
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java