Commits

md_5 authored 2695433990f Merge
[#931/Enum] Merge remote-tracking branch 'origin/pr/931' into experimental
No tags

nms-patches/net/minecraft/advancements/AdvancementHolder.patch

Modified
1 1 --- a/net/minecraft/advancements/AdvancementHolder.java
2 2 +++ b/net/minecraft/advancements/AdvancementHolder.java
3 -@@ -3,6 +3,11 @@
4 - import net.minecraft.network.PacketDataSerializer;
3 +@@ -6,6 +6,11 @@
4 + import net.minecraft.network.codec.StreamCodec;
5 5 import net.minecraft.resources.MinecraftKey;
6 6
7 7 +// CraftBukkit start
8 8 +import org.bukkit.craftbukkit.advancement.CraftAdvancement;
9 9 +import org.bukkit.craftbukkit.util.CraftNamespacedKey;
10 10 +// CraftBukkit end
11 11 +
12 12 public record AdvancementHolder(MinecraftKey id, Advancement value) {
13 13
14 - public void write(PacketDataSerializer packetdataserializer) {
15 -@@ -41,4 +46,10 @@
14 + public static final StreamCodec<RegistryFriendlyByteBuf, AdvancementHolder> STREAM_CODEC = StreamCodec.composite(MinecraftKey.STREAM_CODEC, AdvancementHolder::id, Advancement.STREAM_CODEC, AdvancementHolder::value, AdvancementHolder::new);
15 +@@ -38,4 +43,10 @@
16 16 public String toString() {
17 17 return this.id.toString();
18 18 }
19 19 +
20 20 + // CraftBukkit start
21 21 + public final org.bukkit.advancement.Advancement toBukkit() {
22 22 + return new CraftAdvancement(this);
23 23 + }
24 24 + // CraftBukkit end
25 25 }

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut