2021-06-11 12:02:28 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: TheViperShow <29604693+TheViperShow@users.noreply.github.com>
|
|
|
|
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
|
2021-11-24 17:58:26 +00:00
|
|
|
index 7ffbdfb1d192e70ab2259391210d73b8821e4989..07d357b5fcb30ed9ff074a196a19de1481fe3738 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
|
2021-11-24 17:58:26 +00:00
|
|
|
@@ -83,8 +83,10 @@ public class DispenserBlock extends BaseEntityBlock {
|
2021-06-11 12:02:28 +00:00
|
|
|
int i = tileentitydispenser.getRandomSlot();
|
|
|
|
|
|
|
|
if (i < 0) {
|
2021-06-14 19:17:47 +00:00
|
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFailedDispenseEvent(world, pos)) {// Paper - BlockFailedDispenseEvent is called here
|
|
|
|
world.levelEvent(1001, pos, 0);
|
|
|
|
world.gameEvent(GameEvent.DISPENSE_FAIL, pos);
|
|
|
|
+ } // Paper
|
2021-06-11 12:02:28 +00:00
|
|
|
} else {
|
|
|
|
ItemStack itemstack = tileentitydispenser.getItem(i);
|
2021-06-14 19:17:47 +00:00
|
|
|
DispenseItemBehavior idispensebehavior = this.getDispenseMethod(itemstack);
|
2021-06-11 12:02:28 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/DropperBlock.java b/src/main/java/net/minecraft/world/level/block/DropperBlock.java
|
2021-11-24 17:58:26 +00:00
|
|
|
index 4ae21aa6fc91f527d3dca508588d8257961b8d24..b3203049eade7d11602fa2a12a8104a732d67552 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/block/DropperBlock.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/block/DropperBlock.java
|
2021-11-24 17:58:26 +00:00
|
|
|
@@ -44,6 +44,7 @@ public class DropperBlock extends DispenserBlock {
|
2021-06-11 12:02:28 +00:00
|
|
|
int i = tileentitydispenser.getRandomSlot();
|
|
|
|
|
|
|
|
if (i < 0) {
|
2021-06-14 19:17:47 +00:00
|
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFailedDispenseEvent(world, pos)) // Paper - BlockFailedDispenseEvent is called here
|
|
|
|
world.levelEvent(1001, pos, 0);
|
2021-06-11 12:02:28 +00:00
|
|
|
} 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
|
2021-11-24 17:58:26 +00:00
|
|
|
index 37d99e3a1771feee9edb94f17a649ebb3511a459..fa46a33e34c4ebcf94a54cb597ff6bbb02cfcef9 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
2021-10-02 17:21:49 +00:00
|
|
|
@@ -1830,4 +1830,12 @@ public class CraftEventFactory {
|
2021-09-01 12:03:36 +00:00
|
|
|
EntitiesUnloadEvent event = new EntitiesUnloadEvent(new CraftChunk((ServerLevel) world, coords.x, coords.z), bukkitEntities);
|
2021-06-11 12:02:28 +00:00
|
|
|
Bukkit.getPluginManager().callEvent(event);
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ // Paper start
|
2021-06-14 19:17:47 +00:00
|
|
|
+ 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);
|
2021-06-11 12:02:28 +00:00
|
|
|
+ return event.callEvent();
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|