aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0492-Add-BlockPreDispenseEvent.patch
diff options
context:
space:
mode:
authorRiley Park <[email protected]>2024-05-15 17:06:59 -0700
committerGitHub <[email protected]>2024-05-15 17:06:59 -0700
commitf17519338bc589c045e0b32bfc37e048b23544d5 (patch)
treee50182ec698b4a9de8f366f485ee089b1901bbd9 /patches/server/0492-Add-BlockPreDispenseEvent.patch
parent3fc93581bb876e8149b2ca423375a98f5ca12d27 (diff)
downloadPaper-f17519338bc589c045e0b32bfc37e048b23544d5.tar.gz
Paper-f17519338bc589c045e0b32bfc37e048b23544d5.zip
Expose server build information (#10729)
* Expose server build information * squash patches * final tweaks --------- Co-authored-by: Jake Potrebic <[email protected]> Co-authored-by: masmc05 <[email protected]>
Diffstat (limited to 'patches/server/0492-Add-BlockPreDispenseEvent.patch')
-rw-r--r--patches/server/0492-Add-BlockPreDispenseEvent.patch46
1 files changed, 0 insertions, 46 deletions
diff --git a/patches/server/0492-Add-BlockPreDispenseEvent.patch b/patches/server/0492-Add-BlockPreDispenseEvent.patch
deleted file mode 100644
index 3157a918d0..0000000000
--- a/patches/server/0492-Add-BlockPreDispenseEvent.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Madeline Miller <[email protected]>
-Date: Sun, 17 Jan 2021 13:16:09 +1000
-Subject: [PATCH] Add 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 94bcbaf7daf7dfe566f508d1170a433930d9d49a..f6edfea463b3725d3a79aca38825e86dbf82175c 100644
---- a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
-@@ -110,6 +110,7 @@ public class DispenserBlock extends BaseEntityBlock {
- DispenseItemBehavior idispensebehavior = this.getDispenseMethod(world, itemstack);
-
- if (idispensebehavior != DispenseItemBehavior.NOOP) {
-+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockPreDispenseEvent(world, pos, itemstack, i)) return; // Paper - Add BlockPreDispenseEvent
- DispenserBlock.eventFired = false; // CraftBukkit - reset event status
- tileentitydispenser.setItem(i, idispensebehavior.dispense(sourceblock, 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 efa7cf50b5577f87a2dfa61b59bf81052794fbf1..b4a742e8c513e458b34c216d1e907b47e3aac292 100644
---- a/src/main/java/net/minecraft/world/level/block/DropperBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/DropperBlock.java
-@@ -71,6 +71,7 @@ public class DropperBlock extends DispenserBlock {
- ItemStack itemstack1;
-
- if (iinventory == null) {
-+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockPreDispenseEvent(world, pos, itemstack, i)) return; // Paper - Add BlockPreDispenseEvent
- itemstack1 = DropperBlock.DISPENSE_BEHAVIOUR.dispense(sourceblock, itemstack);
- } else {
- // CraftBukkit start - Fire event when pushing items into other inventories
-diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index b96b2f46a8a21d8e79516d13c06d9442cbca9905..a7b88ce35d0de3019348a01eb84a2bd00aee24a1 100644
---- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -2043,5 +2043,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 = CraftBlock.at(serverLevel, pos);
-+ 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
- }