Resolve patch conflicts

PaperMC · Oct 10, 2024 · 66b68bd · 66b68bd
1 parent cbbad3e
commit 66b68bd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.../1.21.2-pre2/patches/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch b/.../1.21.2-pre2/patches/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -791,7 +_,7 @@
+@@ -792,7 +_,7 @@
          if (item.has(DataComponents.WRITABLE_BOOK_CONTENT)) {
              ItemStack itemStack = item.transmuteCopy(Items.WRITTEN_BOOK);
              itemStack.remove(DataComponents.WRITABLE_BOOK_CONTENT);

diff --git a/versions/1.21.2-pre2/patches/net/minecraft/world/item/AdventureModePredicate.java.patch b/versions/1.21.2-pre2/patches/net/minecraft/world/item/AdventureModePredicate.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/item/AdventureModePredicate.java
 +++ b/net/minecraft/world/item/AdventureModePredicate.java
-@@ -115,7 +_,7 @@
+@@ -117,7 +_,7 @@
          return predicates.stream()
              .flatMap(blockPredicate1 -> blockPredicate1.blocks().orElseThrow().stream())
              .distinct()

diff --git a/versions/1.21.2-pre2/patches/net/minecraft/world/item/crafting/Ingredient.java.patch b/versions/1.21.2-pre2/patches/net/minecraft/world/item/crafting/Ingredient.java.patch
@@ -7,5 +7,5 @@
 -            optional -> optional.<HolderSet.Direct<Item>>map(ingredient -> ingredient.values).orElse(HolderSet.direct())
 +            optional -> optional.map(ingredient -> ingredient.values).orElse(HolderSet.direct())
          );
-     public static final Codec<HolderSet<Item>> NON_AIR_HOLDER_SET_CODEC = HolderSetCodec.create(Registries.ITEM, ItemStack.ITEM_NON_AIR_CODEC, false);
+     public static final Codec<HolderSet<Item>> NON_AIR_HOLDER_SET_CODEC = HolderSetCodec.create(Registries.ITEM, Item.CODEC, false);
      public static final Codec<Ingredient> CODEC = ExtraCodecs.nonEmptyHolderSet(NON_AIR_HOLDER_SET_CODEC)