Move diffs around to compile without later ones applied

patches/server/0421-Add-BellRingEvent.patch

@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Eearslya Sleiarion <eearslya@gmail.com>
+Date: Sun, 23 Aug 2020 13:04:02 +0200
+Subject: [PATCH] Add BellRingEvent
+
+Add a new event, BellRingEvent, to trigger whenever a player rings a
+village bell. Passes along the bell block and the player who rang it.
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+index 8ac093866aec59b4e031b953d4c3c3af66733812..915f49bbfca87682a3ae497dfcd335268f974efe 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -366,10 +366,11 @@ public class CraftEventFactory {
+         return tradeSelectEvent;
+     }
+ 
++    @SuppressWarnings("deprecation") // Paper use deprecated event to maintain compat (it extends modern event)
+     public static boolean handleBellRingEvent(Level world, BlockPos position, Direction direction, Entity entity) {
+         Block block = CraftBlock.at(world, position);
+         BlockFace bukkitDirection = CraftBlock.notchToBlockFace(direction);
+-        BellRingEvent event = new BellRingEvent(block, bukkitDirection, (entity != null) ? entity.getBukkitEntity() : null);
++        BellRingEvent event = new io.papermc.paper.event.block.BellRingEvent(block, bukkitDirection, (entity != null) ? entity.getBukkitEntity() : null); // Paper - deprecated BellRingEvent
+         Bukkit.getPluginManager().callEvent(event);
+         return !event.isCancelled();
+     }