Update to Minecraft 1.20.5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-04-24 01:15:00 +10:00
parent 4deda9501f
commit 65bc2541a3
524 changed files with 7788 additions and 6181 deletions

View File

@@ -1,7 +1,7 @@
--- a/net/minecraft/advancements/AdvancementHolder.java
+++ b/net/minecraft/advancements/AdvancementHolder.java
@@ -3,6 +3,11 @@
import net.minecraft.network.PacketDataSerializer;
@@ -6,6 +6,11 @@
import net.minecraft.network.codec.StreamCodec;
import net.minecraft.resources.MinecraftKey;
+// CraftBukkit start
@@ -11,8 +11,8 @@
+
public record AdvancementHolder(MinecraftKey id, Advancement value) {
public void write(PacketDataSerializer packetdataserializer) {
@@ -41,4 +46,10 @@
public static final StreamCodec<RegistryFriendlyByteBuf, AdvancementHolder> STREAM_CODEC = StreamCodec.composite(MinecraftKey.STREAM_CODEC, AdvancementHolder::id, Advancement.STREAM_CODEC, AdvancementHolder::value, AdvancementHolder::new);
@@ -38,4 +43,10 @@
public String toString() {
return this.id.toString();
}

View File

@@ -1,14 +1,5 @@
--- a/net/minecraft/advancements/AdvancementTree.java
+++ b/net/minecraft/advancements/AdvancementTree.java
@@ -68,7 +68,7 @@
}
public void addAll(Collection<AdvancementHolder> collection) {
- ArrayList arraylist = new ArrayList(collection);
+ ArrayList<AdvancementHolder> arraylist = new ArrayList(collection); // CraftBukkit - decompile error
while (!arraylist.isEmpty()) {
if (!arraylist.removeIf(this::tryInsert)) {
@@ -77,7 +77,7 @@
}
}