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-01-02 19:29:53 +01:00
|
|
|
index 415d387f8cfa3ae99b1c809233c86c18b76ad1e2..0286740aabe04e6e78ad6efd003a1e1a1ab6a460 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-01-02 19:29:53 +01:00
|
|
|
@@ -1106,6 +1106,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) {
|
|
|
|
+ // Paper start
|
|
|
|
+ ItemStack result = org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDispenseEvent(pointer, blockposition, stack, this);
|
|
|
|
+ if (result != null) {
|
|
|
|
+ this.setSuccess(false);
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
RespawnAnchorBlock.charge((Entity) null, worldserver, blockposition, iblockdata);
|
|
|
|
stack.shrink(1);
|
|
|
|
} else {
|
2024-01-02 19:29:53 +01:00
|
|
|
@@ -1128,6 +1135,13 @@ public interface DispenseItemBehavior {
|
2023-07-03 01:12:07 +02:00
|
|
|
Optional<BlockState> optional = HoneycombItem.getWaxed(iblockdata);
|
|
|
|
|
|
|
|
if (optional.isPresent()) {
|
|
|
|
+ // Paper start
|
|
|
|
+ ItemStack result = org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDispenseEvent(pointer, blockposition, stack, this);
|
|
|
|
+ if (result != null) {
|
|
|
|
+ this.setSuccess(false);
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
worldserver.setBlockAndUpdate(blockposition, (BlockState) optional.get());
|
|
|
|
worldserver.levelEvent(3003, blockposition, 0);
|
|
|
|
stack.shrink(1);
|
2024-01-02 19:29:53 +01:00
|
|
|
@@ -1153,6 +1167,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 {
|
|
|
|
+ // Paper start
|
|
|
|
+ ItemStack result = org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDispenseEvent(pointer, blockposition1, stack, this);
|
|
|
|
+ if (result != null) {
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
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-01-14 13:33:47 +01:00
|
|
|
index a6897c9a46d9cef083d5424c5b4a2ed0a32dfe3b..5ead89e46d9cf17980baf35cda000bc4c0e7425b 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
|
Updated Upstream (Bukkit/CraftBukkit) (#10034)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
f29cb801 Separate checkstyle-suppressions file is not required
86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API
d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor
b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack
9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode()
994a6163 Attempt upgrade of resolver libraries
CraftBukkit Changes:
b3b43a6ad Add Checkstyle check for unused imports
13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names
3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API
2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor
1dbdbbed4 PR-1238: Remove unnecessary sign ticking
659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper
e37e29ce0 Increase outdated build delay
c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack
492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode()
e11fbb9d7 Upgrade MySQL driver
9f3a0bd2a Attempt upgrade of resolver libraries
60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion
Spigot Changes:
06d602e7 Rebuild patches
2023-12-17 03:09:28 +01:00
|
|
|
@@ -2098,6 +2098,32 @@ public class CraftEventFactory {
|
2023-07-03 01:12:07 +02:00
|
|
|
}
|
|
|
|
// Paper end
|
|
|
|
|
|
|
|
+ // Paper start - missing BlockDispenseEvent calls
|
|
|
|
+ @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) {
|
|
|
|
+ org.bukkit.block.Block bukkitBlock = pointer.level().getWorld().getBlockAt(pointer.pos().getX(), pointer.pos().getY(), pointer.pos().getZ());
|
2023-07-03 01:12:07 +02:00
|
|
|
+ CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemStack.copyWithCount(1));
|
|
|
|
+
|
|
|
|
+ org.bukkit.event.block.BlockDispenseEvent event = new org.bukkit.event.block.BlockDispenseEvent(bukkitBlock, craftItem.clone(), new org.bukkit.util.Vector(to.getX(), to.getY(), to.getZ()));
|
|
|
|
+ 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());
|
|
|
|
+ net.minecraft.core.dispenser.DispenseItemBehavior idispensebehavior = net.minecraft.world.level.block.DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
|
|
|
|
+ if (idispensebehavior != net.minecraft.core.dispenser.DispenseItemBehavior.NOOP && idispensebehavior != instance) {
|
|
|
|
+ idispensebehavior.dispense(pointer, eventStack);
|
|
|
|
+ return itemStack;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+ // Paper end - missing BlockDispenseEvent calls
|
|
|
|
+
|
|
|
|
// Paper start - add EntityFertilizeEggEvent
|
|
|
|
/**
|
|
|
|
* Calls the io.papermc.paper.event.entity.EntityFertilizeEggEvent.
|