Update to Minecraft 1.17

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-06-11 15:00:00 +10:00
parent 75faba7fde
commit b3a8254758
619 changed files with 10708 additions and 8451 deletions

View File

@@ -7,8 +7,8 @@
+ public final org.bukkit.advancement.Advancement bukkit = new org.bukkit.craftbukkit.advancement.CraftAdvancement(this); // CraftBukkit
public Advancement(MinecraftKey minecraftkey, @Nullable Advancement advancement, @Nullable AdvancementDisplay advancementdisplay, AdvancementRewards advancementrewards, Map<String, Criterion> map, String[][] astring) {
this.key = minecraftkey;
@@ -222,7 +223,7 @@
this.id = minecraftkey;
@@ -233,7 +234,7 @@
}
public Advancement b(MinecraftKey minecraftkey) {

View File

@@ -1,6 +1,15 @@
--- a/net/minecraft/advancements/Advancements.java
+++ b/net/minecraft/advancements/Advancements.java
@@ -73,7 +73,7 @@
@@ -79,7 +79,7 @@
entry = (Entry) iterator.next();
MinecraftKey minecraftkey = (MinecraftKey) entry.getKey();
Advancement.SerializedAdvancement advancement_serializedadvancement = (Advancement.SerializedAdvancement) entry.getValue();
- Map map1 = this.advancements;
+ Map<MinecraftKey, Advancement> map1 = this.advancements; // CraftBukkit - decompile error
Objects.requireNonNull(this.advancements);
if (advancement_serializedadvancement.a(map1::get)) {
@@ -116,7 +116,7 @@
}
}
@@ -8,4 +17,4 @@
+ // Advancements.LOGGER.info("Loaded {} advancements", this.advancements.size()); // CraftBukkit - moved to AdvancementDataWorld#reload
}
public Iterable<Advancement> b() {
public void a() {