Several fixes and new api for experience merging/stacking (#9242)

1 files changed, 25 insertions, 0 deletions

diff --git a/patches/server/0407-Add-BellRingEvent.patch b/patches/server/0407-Add-BellRingEvent.patch
new file mode 100644
index 0000000000..e1fd6ce23f
--- /dev/null
+++ b/patches/server/0407-Add-BellRingEvent.patch
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Eearslya Sleiarion <[email protected]>
+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 c3c7cfc33d07b87e034fb050b0a1ca1d8b971aa6..c6408feaff6a5bd8529004e6c2e1aa76ddc8c861 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -367,10 +367,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();
+     }