Paper/patches/server/0459-Add-BlockFailedDispenseEvent.patch

51 lines
3.1 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02: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] Add BlockFailedDispenseEvent
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
2024-10-27 19:26:21 +01:00
index f4510b8e14d0b9997907ce1d1368ba3b3b5daf3e..f4853a5ff8a45efcda2d7781c1fa897c47d8ea46 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
2024-10-23 17:58:11 +02:00
@@ -98,8 +98,10 @@ public class DispenserBlock extends BaseEntityBlock {
2023-09-22 07:41:27 +02:00
int i = tileentitydispenser.getRandomSlot(world.random);
2021-06-11 14:02:28 +02:00
2023-09-22 07:41:27 +02:00
if (i < 0) {
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFailedDispenseEvent(world, pos)) { // Paper - Add BlockFailedDispenseEvent
2023-09-22 07:41:27 +02:00
world.levelEvent(1001, pos, 0);
2024-04-24 15:46:45 +02:00
world.gameEvent((Holder) GameEvent.BLOCK_ACTIVATE, pos, GameEvent.Context.of(tileentitydispenser.getBlockState()));
+ } // Paper - Add BlockFailedDispenseEvent
2023-09-22 07:41:27 +02:00
} else {
ItemStack itemstack = tileentitydispenser.getItem(i);
2024-04-24 15:46:45 +02:00
DispenseItemBehavior idispensebehavior = this.getDispenseMethod(world, itemstack);
2021-06-11 14:02:28 +02: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
2024-10-27 19:26:21 +01:00
index a08e8571f3a83afc80c2f1758a9029cd28ed6947..91b514967405115f22edf4255775361a672e5c2f 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/level/block/DropperBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/DropperBlock.java
2024-04-24 15:46:45 +02:00
@@ -60,6 +60,7 @@ public class DropperBlock extends DispenserBlock {
2023-09-22 07:41:27 +02:00
int i = tileentitydispenser.getRandomSlot(world.random);
2021-06-11 14:02:28 +02:00
2023-09-22 07:41:27 +02:00
if (i < 0) {
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFailedDispenseEvent(world, pos)) // Paper - Add BlockFailedDispenseEvent
2023-09-22 07:41:27 +02:00
world.levelEvent(1001, pos, 0);
} else {
ItemStack itemstack = tileentitydispenser.getItem(i);
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
2024-10-24 12:11:32 +02:00
index 9f97216a4be562acb69281f4a638dad139c6bc7d..1e918ef9296e5127b78a7eb0460225448982772e 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
2024-10-24 12:11:32 +02:00
@@ -2125,4 +2125,12 @@ public class CraftEventFactory {
2024-02-01 10:15:57 +01:00
return org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getPotion());
2021-06-11 14:02:28 +02:00
}
2024-02-01 10:15:57 +01:00
// Paper end - WitchReadyPotionEvent
2021-06-11 14:02:28 +02:00
+
+ // Paper start
2024-02-01 10:15:57 +01:00
+ 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);
2021-06-11 14:02:28 +02:00
+ return event.callEvent();
+ }
+ // Paper end
}