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

2024-01-19 13:22:30 +01:00 · 2024-01-19 13:22:30 +01:00 · 64e5ff904c
commit 64e5ff904c
parent b5b92e90d8
46 changed files with 242 additions and 290 deletions
--- a/patches/server/Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/Properly-handle-experience-dropping-on-block-break.patch
@ -41,7 +41,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
         }
         return true;
     }
-     // Paper end
+     // Paper end - Add BlockBreakBlockEvent
 
     public static void dropResources(BlockState state, Level world, BlockPos pos, @Nullable BlockEntity blockEntity, @Nullable Entity entity, ItemStack tool) {
 +    // Paper start - Properly handle xp dropping