aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0547-Implemented-BlockFailedDispenseEvent.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0547-Implemented-BlockFailedDispenseEvent.patch')
-rw-r--r--patches/server/0547-Implemented-BlockFailedDispenseEvent.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/patches/server/0547-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0547-Implemented-BlockFailedDispenseEvent.patch
new file mode 100644
index 0000000000..9c14300d5a
--- /dev/null
+++ b/patches/server/0547-Implemented-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] Implemented 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 c0e19826163b0eaa429d217b54bb67b8b582a669..85c5319837295bd2f85baebfe8d6660b267f1d5f 100644
+--- a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
+@@ -84,8 +84,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 - BlockFailedDispenseEvent is called here
+ world.levelEvent(1001, pos, 0);
+ world.gameEvent((Entity) null, GameEvent.DISPENSE_FAIL, pos);
++ } // Paper
+ } else {
+ ItemStack itemstack = tileentitydispenser.getItem(i);
+ DispenseItemBehavior idispensebehavior = this.getDispenseMethod(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 1415ad60163f6584619cc7caa61f1848d6ebaa93..801c4c120e98584bcf218a4ef9bd66d7d18c1097 100644
+--- a/src/main/java/net/minecraft/world/level/block/DropperBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/DropperBlock.java
+@@ -44,6 +44,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 - BlockFailedDispenseEvent is called here
+ 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 7f8dbc94ad04ff58e0ee7591b42e268ee4b75576..5162109ea1f8284f0302306f8dac3048ce0b7010 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -1868,4 +1868,12 @@ public class CraftEventFactory {
+ EntitiesUnloadEvent event = new EntitiesUnloadEvent(new CraftChunk((ServerLevel) world, coords.x, coords.z), bukkitEntities);
+ Bukkit.getPluginManager().callEvent(event);
+ }
++
++ // Paper start
++ public static boolean handleBlockFailedDispenseEvent(ServerLevel serverLevel, BlockPos blockposition) {
++ org.bukkit.block.Block block = serverLevel.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
++ io.papermc.paper.event.block.BlockFailedDispenseEvent event = new io.papermc.paper.event.block.BlockFailedDispenseEvent(block);
++ return event.callEvent();
++ }
++ // Paper end
+ }