geforkt von Mirrors/Paper
89d51d5f29
Because this exploit has been widely known for years and has not been fixed by Mojang, we decided that it was worth allowing people to toggle it on/off due to how easy it is to make it configurable. It should be noted that this decision does not promise all future exploits will be configurable.
89 Zeilen
5.4 KiB
Diff
89 Zeilen
5.4 KiB
Diff
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
|
|
index b83af374a33a66a6ceeca119b961eea883bba41c..175b965c92b8b8be9c671e1ee478afa9a2f7bf82 100644
|
|
--- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
|
|
+++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
|
|
@@ -1112,6 +1112,13 @@ public interface DispenseItemBehavior {
|
|
this.setSuccess(true);
|
|
if (iblockdata.is(Blocks.RESPAWN_ANCHOR)) {
|
|
if ((Integer) iblockdata.getValue(RespawnAnchorBlock.CHARGE) != 4) {
|
|
+ // Paper start - Call missing BlockDispenseEvent
|
|
+ ItemStack result = org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDispenseEvent(pointer, blockposition, stack, this);
|
|
+ if (result != null) {
|
|
+ this.setSuccess(false);
|
|
+ return result;
|
|
+ }
|
|
+ // Paper end - Call missing BlockDispenseEvent
|
|
RespawnAnchorBlock.charge((Entity) null, worldserver, blockposition, iblockdata);
|
|
stack.shrink(1);
|
|
} else {
|
|
@@ -1134,6 +1141,13 @@ public interface DispenseItemBehavior {
|
|
Optional<BlockState> optional = HoneycombItem.getWaxed(iblockdata);
|
|
|
|
if (optional.isPresent()) {
|
|
+ // Paper start - Call missing BlockDispenseEvent
|
|
+ ItemStack result = org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDispenseEvent(pointer, blockposition, stack, this);
|
|
+ if (result != null) {
|
|
+ this.setSuccess(false);
|
|
+ return result;
|
|
+ }
|
|
+ // Paper end - Call missing BlockDispenseEvent
|
|
worldserver.setBlockAndUpdate(blockposition, (BlockState) optional.get());
|
|
worldserver.levelEvent(3003, blockposition, 0);
|
|
stack.shrink(1);
|
|
@@ -1159,6 +1173,12 @@ public interface DispenseItemBehavior {
|
|
if (!worldserver.getBlockState(blockposition1).is(BlockTags.CONVERTABLE_TO_MUD)) {
|
|
return this.defaultDispenseItemBehavior.dispense(pointer, stack);
|
|
} else {
|
|
+ // Paper start - Call missing BlockDispenseEvent
|
|
+ ItemStack result = org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDispenseEvent(pointer, blockposition1, stack, this);
|
|
+ if (result != null) {
|
|
+ return result;
|
|
+ }
|
|
+ // Paper end - Call missing BlockDispenseEvent
|
|
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
|
|
index 52c1d39f494ba441bc93382d895679bcd15fcbde..cd6ee371910328d4ab6f4a018fa0e4a48dbc7982 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
@@ -2109,6 +2109,32 @@ public class CraftEventFactory {
|
|
}
|
|
// Paper end
|
|
|
|
+ // Paper start - Call missing BlockDispenseEvent
|
|
+ @Nullable
|
|
+ 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 = CraftBlock.at(pointer.level(), pointer.pos());
|
|
+ CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemStack.copyWithCount(1));
|
|
+
|
|
+ org.bukkit.event.block.BlockDispenseEvent event = new org.bukkit.event.block.BlockDispenseEvent(bukkitBlock, craftItem.clone(), CraftVector.toBukkit(to));
|
|
+ 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 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);
|
|
+ return itemStack;
|
|
+ }
|
|
+ }
|
|
+ return null;
|
|
+ }
|
|
+ // Paper end - Call missing BlockDispenseEvent
|
|
+
|
|
// Paper start - add EntityFertilizeEggEvent
|
|
/**
|
|
* Calls the {@link io.papermc.paper.event.entity.EntityFertilizeEggEvent}.
|