aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0474-Add-BlockFailedDispenseEvent.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0474-Add-BlockFailedDispenseEvent.patch')
-rw-r--r--patches/server/0474-Add-BlockFailedDispenseEvent.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/patches/server/0474-Add-BlockFailedDispenseEvent.patch b/patches/server/0474-Add-BlockFailedDispenseEvent.patch
new file mode 100644
index 0000000000..b1c5648ed3
--- /dev/null
+++ b/patches/server/0474-Add-BlockFailedDispenseEvent.patch
@@ -0,0 +1,50 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: TheViperShow <[email protected]>
+Date: Wed, 22 Apr 2020 09:40:38 +0200
+Subject: [PATCH] Add BlockFailedDispenseEvent
+
+
+diff --git a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
+index c7256ffbe57c594556ee85134c9ab166f8c0e0c7..94bcbaf7daf7dfe566f508d1170a433930d9d49a 100644
+--- a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
+@@ -101,8 +101,10 @@ public class DispenserBlock extends BaseEntityBlock {
+ int i = tileentitydispenser.getRandomSlot(world.random);
+
+ if (i < 0) {
++ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFailedDispenseEvent(world, pos)) { // Paper - Add BlockFailedDispenseEvent
+ world.levelEvent(1001, pos, 0);
+ world.gameEvent((Holder) GameEvent.BLOCK_ACTIVATE, pos, GameEvent.Context.of(tileentitydispenser.getBlockState()));
++ } // Paper - Add BlockFailedDispenseEvent
+ } else {
+ ItemStack itemstack = tileentitydispenser.getItem(i);
+ DispenseItemBehavior idispensebehavior = this.getDispenseMethod(world, itemstack);
+diff --git a/src/main/java/net/minecraft/world/level/block/DropperBlock.java b/src/main/java/net/minecraft/world/level/block/DropperBlock.java
+index e772b6f8f78ad1292b8fa268e8bb4001a38706c6..efa7cf50b5577f87a2dfa61b59bf81052794fbf1 100644
+--- a/src/main/java/net/minecraft/world/level/block/DropperBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/DropperBlock.java
+@@ -60,6 +60,7 @@ public class DropperBlock extends DispenserBlock {
+ int i = tileentitydispenser.getRandomSlot(world.random);
+
+ if (i < 0) {
++ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFailedDispenseEvent(world, pos)) // Paper - Add BlockFailedDispenseEvent
+ world.levelEvent(1001, pos, 0);
+ } else {
+ ItemStack itemstack = tileentitydispenser.getItem(i);
+diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+index e55dafab2f986e445d9499cecd346bc96673bc9c..b96b2f46a8a21d8e79516d13c06d9442cbca9905 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -2036,4 +2036,12 @@ public class CraftEventFactory {
+ return org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getPotion());
+ }
+ // Paper end - WitchReadyPotionEvent
++
++ // Paper start
++ public static boolean handleBlockFailedDispenseEvent(ServerLevel serverLevel, BlockPos pos) {
++ org.bukkit.block.Block block = CraftBlock.at(serverLevel, pos);
++ io.papermc.paper.event.block.BlockFailedDispenseEvent event = new io.papermc.paper.event.block.BlockFailedDispenseEvent(block);
++ return event.callEvent();
++ }
++ // Paper end
+ }