mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

chore: cleanup annotations in api adventure patch

Browse source
This commit is contained in:
Riley Park 2023-03-23 09:49:24 -07:00
commit 39255145b6
64 changed files with 1308 additions and 1246 deletions
Download patch file Download diff file Expand all files Collapse all files

12
patches/server/Add-more-advancement-API.patch
View file

@ -137,9 +137,12 @@ 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
@ -161,11 +164,10 @@ 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;
@ -173,7 +175,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