mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-06 19:00:16 +01:00
35 lines
2.3 KiB
Diff
35 lines
2.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Matthew Miller <mnmiller1@me.com>
|
||
|
|
Date: Sun, 17 Jan 2021 13:16:09 +1000
|
||
|
|
Subject: [PATCH] Implement BlockPreDispenseEvent
|
||
|
|
|
||
|
|
|
||
|
|
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 501a5483160dba050261bb3448317a097cdb7ef2..2dcac4b638073aa1748f26f61219dbf95fd1ced6 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
|
||
|
|
@@ -91,6 +91,7 @@ public class DispenserBlock extends BaseEntityBlock {
|
||
|
|
DispenseItemBehavior idispensebehavior = this.getDispenseMethod(itemstack);
|
||
|
|
|
||
|
|
if (idispensebehavior != DispenseItemBehavior.NOOP) {
|
||
|
|
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockPreDispenseEvent(world, pos, itemstack, i)) return; // Paper - BlockPreDispenseEvent is called here
|
||
|
|
DispenserBlock.eventFired = false; // CraftBukkit - reset event status
|
||
|
|
tileentitydispenser.setItem(i, idispensebehavior.dispense(sourceblock, itemstack));
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||
|
|
index f6f2856c407abe195f1dfee7f4a7e30baea585f7..ea7082ab595f7bce572eec66ce7790a0afa8dae1 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||
|
|
@@ -1809,5 +1809,11 @@ public class CraftEventFactory {
|
||
|
|
io.papermc.paper.event.block.BlockFailedDispenseEvent event = new io.papermc.paper.event.block.BlockFailedDispenseEvent(block);
|
||
|
|
return event.callEvent();
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ public static boolean handleBlockPreDispenseEvent(ServerLevel serverLevel, BlockPos pos, ItemStack itemStack, int slot) {
|
||
|
|
+ org.bukkit.block.Block block = serverLevel.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ());
|
||
|
|
+ io.papermc.paper.event.block.BlockPreDispenseEvent event = new io.papermc.paper.event.block.BlockPreDispenseEvent(block, org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemStack), slot);
|
||
|
|
+ return event.callEvent();
|
||
|
|
+ }
|
||
|
|
// Paper end
|
||
|
|
}
|