Update to Minecraft 1.18-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-11-22 09:00:00 +11:00
parent a852b81a69
commit 43702a9e10
700 changed files with 10286 additions and 10098 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/advancements/Advancement.java
+++ b/net/minecraft/advancements/Advancement.java
@@ -39,6 +39,7 @@
@@ -41,6 +41,7 @@
private final String[][] requirements;
private final Set<Advancement> children = Sets.newLinkedHashSet();
private final IChatBaseComponent chatComponent;
@@ -8,12 +8,3 @@
public Advancement(MinecraftKey minecraftkey, @Nullable Advancement advancement, @Nullable AdvancementDisplay advancementdisplay, AdvancementRewards advancementrewards, Map<String, Criterion> map, String[][] astring) {
this.id = minecraftkey;
@@ -233,7 +234,7 @@
}
public Advancement b(MinecraftKey minecraftkey) {
- if (!this.a((minecraftkey1) -> {
+ if (!this.a((Function<MinecraftKey, Advancement>) (minecraftkey1) -> { // CraftBukkit - decompile error
return null;
})) {
throw new IllegalStateException("Tried to build incomplete advancement!");

View File

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