2023-07-03 01:12:07 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
|
|
|
|
Date: Sat, 29 Oct 2022 15:41:56 +0200
|
|
|
|
Subject: [PATCH] Call missing BlockDispenseEvent
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
|
2024-06-14 10:17:11 +02:00
|
|
|
index 96db0b1041a4c0f054d4f3f2bdced960b119664e..78951f50188528718cdb3dbbaabe3f9f2760ffe3 100644
|
2023-07-03 01:12:07 +02:00
|
|
|
--- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
|
|
|
|
+++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
|
2024-06-14 10:17:11 +02:00
|
|
|
@@ -867,6 +867,13 @@ public interface DispenseItemBehavior {
|
2023-07-03 01:12:07 +02:00
|
|
|
this.setSuccess(true);
|
|
|
|
if (iblockdata.is(Blocks.RESPAWN_ANCHOR)) {
|
|
|
|
if ((Integer) iblockdata.getValue(RespawnAnchorBlock.CHARGE) != 4) {
|
2024-01-15 12:38:39 +01:00
|
|
|
+ // Paper start - Call missing BlockDispenseEvent
|
2023-07-03 01:12:07 +02:00
|
|
|
+ ItemStack result = org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDispenseEvent(pointer, blockposition, stack, this);
|
|
|
|
+ if (result != null) {
|
|
|
|
+ this.setSuccess(false);
|
|
|
|
+ return result;
|
|
|
|
+ }
|
2024-01-15 12:38:39 +01:00
|
|
|
+ // Paper end - Call missing BlockDispenseEvent
|
2023-07-03 01:12:07 +02:00
|
|
|
RespawnAnchorBlock.charge((Entity) null, worldserver, blockposition, iblockdata);
|
|
|
|
stack.shrink(1);
|
|
|
|
} else {
|
2024-06-14 10:17:11 +02:00
|
|
|
@@ -944,6 +951,13 @@ public interface DispenseItemBehavior {
|
2023-07-03 01:12:07 +02:00
|
|
|
Optional<BlockState> optional = HoneycombItem.getWaxed(iblockdata);
|
|
|
|
|
|
|
|
if (optional.isPresent()) {
|
2024-01-15 12:38:39 +01:00
|
|
|
+ // Paper start - Call missing BlockDispenseEvent
|
2023-07-03 01:12:07 +02:00
|
|
|
+ ItemStack result = org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDispenseEvent(pointer, blockposition, stack, this);
|
|
|
|
+ if (result != null) {
|
|
|
|
+ this.setSuccess(false);
|
|
|
|
+ return result;
|
|
|
|
+ }
|
2024-01-15 12:38:39 +01:00
|
|
|
+ // Paper end - Call missing BlockDispenseEvent
|
2023-07-03 01:12:07 +02:00
|
|
|
worldserver.setBlockAndUpdate(blockposition, (BlockState) optional.get());
|
|
|
|
worldserver.levelEvent(3003, blockposition, 0);
|
|
|
|
stack.shrink(1);
|
2024-06-14 10:17:11 +02:00
|
|
|
@@ -971,6 +985,12 @@ public interface DispenseItemBehavior {
|
2023-07-03 01:12:07 +02:00
|
|
|
if (!worldserver.getBlockState(blockposition1).is(BlockTags.CONVERTABLE_TO_MUD)) {
|
|
|
|
return this.defaultDispenseItemBehavior.dispense(pointer, stack);
|
|
|
|
} else {
|
2024-01-15 12:38:39 +01:00
|
|
|
+ // Paper start - Call missing BlockDispenseEvent
|
2023-07-03 01:12:07 +02:00
|
|
|
+ ItemStack result = org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDispenseEvent(pointer, blockposition1, stack, this);
|
|
|
|
+ if (result != null) {
|
|
|
|
+ return result;
|
|
|
|
+ }
|
2024-01-15 12:38:39 +01:00
|
|
|
+ // Paper end - Call missing BlockDispenseEvent
|
2023-07-03 01:12:07 +02:00
|
|
|
if (!worldserver.isClientSide) {
|
|
|
|
for (int k = 0; k < 5; ++k) {
|
|
|
|
worldserver.sendParticles(ParticleTypes.SPLASH, (double) blockposition.getX() + worldserver.random.nextDouble(), (double) (blockposition.getY() + 1), (double) blockposition.getZ() + worldserver.random.nextDouble(), 1, 0.0D, 0.0D, 0.0D, 1.0D);
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
2024-06-14 19:15:52 +02:00
|
|
|
index 214a1b8901947e8c08e8d7fc3f19e866a21350c8..35b6443d15678ec84271dcebf29b98b36df97a6e 100644
|
2023-07-03 01:12:07 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
2024-06-14 19:15:52 +02:00
|
|
|
@@ -2129,6 +2129,32 @@ public class CraftEventFactory {
|
2023-07-03 01:12:07 +02:00
|
|
|
}
|
|
|
|
// Paper end
|
|
|
|
|
2024-01-15 12:38:39 +01:00
|
|
|
+ // Paper start - Call missing BlockDispenseEvent
|
2023-07-03 01:12:07 +02:00
|
|
|
+ @Nullable
|
2023-09-22 19:31:02 +02:00
|
|
|
+ public static ItemStack handleBlockDispenseEvent(net.minecraft.core.dispenser.BlockSource pointer, BlockPos to, ItemStack itemStack, net.minecraft.core.dispenser.DispenseItemBehavior instance) {
|
2024-02-01 10:15:57 +01:00
|
|
|
+ org.bukkit.block.Block bukkitBlock = CraftBlock.at(pointer.level(), pointer.pos());
|
2023-07-03 01:12:07 +02:00
|
|
|
+ CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemStack.copyWithCount(1));
|
|
|
|
+
|
2024-02-01 10:15:57 +01:00
|
|
|
+ org.bukkit.event.block.BlockDispenseEvent event = new org.bukkit.event.block.BlockDispenseEvent(bukkitBlock, craftItem.clone(), CraftVector.toBukkit(to));
|
2023-07-03 01:12:07 +02:00
|
|
|
+ if (!net.minecraft.world.level.block.DispenserBlock.eventFired) {
|
|
|
|
+ if (!event.callEvent()) {
|
|
|
|
+ return itemStack;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (!event.getItem().equals(craftItem)) {
|
|
|
|
+ // Chain to handler for new item
|
|
|
|
+ ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
|
2024-02-01 10:15:57 +01:00
|
|
|
+ net.minecraft.core.dispenser.DispenseItemBehavior itemBehavior = net.minecraft.world.level.block.DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
|
|
|
|
+ if (itemBehavior != net.minecraft.core.dispenser.DispenseItemBehavior.NOOP && itemBehavior != instance) {
|
|
|
|
+ itemBehavior.dispense(pointer, eventStack);
|
2023-07-03 01:12:07 +02:00
|
|
|
+ return itemStack;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return null;
|
|
|
|
+ }
|
2024-01-15 12:38:39 +01:00
|
|
|
+ // Paper end - Call missing BlockDispenseEvent
|
2023-07-03 01:12:07 +02:00
|
|
|
+
|
|
|
|
// Paper start - add EntityFertilizeEggEvent
|
|
|
|
/**
|
2024-02-01 10:15:57 +01:00
|
|
|
* Calls the {@link io.papermc.paper.event.entity.EntityFertilizeEggEvent}.
|