Fire EntityChangeBlockEvent in more places

Co-authored-by: ChristopheG <61288881+chrisgdt@users.noreply.github.com> Co-authored-by: maxcom1 <46265094+maxcom1@users.noreply.github.com>
2021-08-09 20:45:46 -07:00
parent 2aae5e2218
commit 75c623590f
11 changed files with 261 additions and 28 deletions
--- a/paper-server/patches/sources/net/minecraft/world/item/AxeItem.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/item/AxeItem.java.patch
@@ -0,0 +1,14 @@
+--- a/net/minecraft/world/item/AxeItem.java
+++ b/net/minecraft/world/item/AxeItem.java
+@@ -67,6 +67,11 @@
+                 return InteractionResult.PASS;
+             } else {
+                 ItemStack itemStack = context.getItemInHand();
+                // Paper start - EntityChangeBlockEvent
+                if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(player, blockPos, optional.get())) {
+                    return InteractionResult.PASS;
+                }
+                // Paper end
+                 if (player instanceof ServerPlayer) {
+                     CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger((ServerPlayer)player, blockPos, itemStack);
+                 }