[ci skip] Add more identifying patch comments, merge related patches

2024-01-19 13:22:30 +01:00
parent b5b92e90d8
commit 64e5ff904c
46 changed files with 242 additions and 290 deletions
--- a/patches/server/Clear-bucket-NBT-after-dispense.patch
+++ b/patches/server/Clear-bucket-NBT-after-dispense.patch
@@ -14,7 +14,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                     if (stack.isEmpty()) {
 -                        stack.setItem(Items.BUCKET);
 -                        stack.setCount(1);
-+                        stack = new ItemStack(item); // Paper - clear tag
+                        stack = new ItemStack(item); // Paper - Clear bucket NBT after dispense
                     } else if (pointer.blockEntity().addItem(new ItemStack(item)) < 0) {
                         this.defaultDispenseItemBehavior.dispense(pointer, new ItemStack(item));
                     }