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-12-03 20:34:55 +01:00
|
|
|
index 780f83d50aac70c819608f4c79c08ef34664d7b0..8322b54451a6203a8969fdc96ed63bbcc0dd2f5a 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-10-24 10:42:29 +02:00
|
|
|
@@ -768,6 +768,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-10-24 10:42:29 +02:00
|
|
|
@@ -845,6 +852,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-10-24 10:42:29 +02:00
|
|
|
@@ -872,6 +886,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
|
Rework async chunk api implementation
Firstly, the old methods all routed to the CompletableFuture method.
However, the CF method could not guarantee that if the caller
was off-main that the future would be "completed" on-main. Since
the callback methods used the CF one, this meant that the callback
methods did not guarantee that the callbacks were to be called on
the main thread.
Now, all methods route to getChunkAtAsync(x, z, gen, urgent, cb)
so that the methods with the callback are guaranteed to invoke
the callback on the main thread. The CF behavior remains unchanged;
it may still appear to complete on main if invoked off-main.
Secondly, remove the scheduleOnMain invocation in the async
chunk completion. This unnecessarily delays the callback
by 1 tick.
Thirdly, add getChunksAtAsync(minX, minZ, maxX, maxZ, ...) which
will load chunks within an area. This method is provided as a helper
as keeping all chunks loaded within an area can be complicated to
implement for plugins (due to the lacking ticket API), and is
already implemented internally anyways.
Fourthly, remove the ticket addition that occured with getChunkAt
and getChunkAtAsync. The ticket addition may delay the unloading
of the chunk unnecessarily. It also fixes a very rare timing bug
where the future/callback would be completed after the chunk
unloads.
2024-11-19 07:34:32 +01:00
|
|
|
index 8fba20a2ff4ef43aa3bda1116f58b696bde2b9b8..28e56095ec4b6fb73df747ec796498f8692c2a24 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-10-24 12:11:32 +02:00
|
|
|
@@ -2196,6 +2196,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}.
|