mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-10 12:02:36 +01:00
49 lines
2.7 KiB
Diff
49 lines
2.7 KiB
Diff
|
--- a/net/minecraft/world/level/block/CaveVines.java
|
||
|
|
+++ b/net/minecraft/world/level/block/CaveVines.java
|
||
|
|
@@ -15,17 +15,43 @@
|
||
|
|
import net.minecraft.world.level.block.state.properties.BlockStateBoolean;
|
||
|
|
import net.minecraft.world.phys.shapes.VoxelShape;
|
||
|
|
|
||
|
|
+// CraftBukkit start
|
||
|
|
+import java.util.Collections;
|
||
|
|
+import net.minecraft.world.entity.Entity;
|
||
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
||
|
|
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
|
||
|
|
+import org.bukkit.event.player.PlayerHarvestBlockEvent;
|
||
|
|
+// CraftBukkit end
|
||
|
|
+
|
||
|
|
public interface CaveVines {
|
||
|
|
|
||
|
|
VoxelShape SHAPE = Block.a(1.0D, 0.0D, 1.0D, 15.0D, 16.0D, 15.0D);
|
||
|
|
BlockStateBoolean BERRIES = BlockProperties.BERRIES;
|
||
|
|
|
||
|
|
- static EnumInteractionResult harvest(IBlockData iblockdata, World world, BlockPosition blockposition) {
|
||
|
|
+ static EnumInteractionResult harvest(IBlockData iblockdata, World world, BlockPosition blockposition, Entity entity) {
|
||
|
|
if ((Boolean) iblockdata.get(CaveVines.BERRIES)) {
|
||
|
|
- Block.a(world, blockposition, new ItemStack(Items.GLOW_BERRIES, 1));
|
||
|
|
+ // CraftBukkit start
|
||
|
|
+ if (entity instanceof EntityHuman) {
|
||
|
|
+ PlayerHarvestBlockEvent event = CraftEventFactory.callPlayerHarvestBlockEvent(world, blockposition, (EntityHuman) entity, Collections.singletonList(new ItemStack(Items.GLOW_BERRIES, 1)));
|
||
|
|
+ if (event.isCancelled()) {
|
||
|
|
+ return EnumInteractionResult.SUCCESS; // We need to return a success either way, because making it PASS or FAIL will result in a bug where cancelling while harvesting w/ block in hand places block
|
||
|
|
+ }
|
||
|
|
+ for (org.bukkit.inventory.ItemStack itemStack : event.getItemsHarvested()) {
|
||
|
|
+ Block.a(world, blockposition, CraftItemStack.asNMSCopy(itemStack));
|
||
|
|
+ }
|
||
|
|
+ } else {
|
||
|
|
+ Block.a(world, blockposition, new ItemStack(Items.GLOW_BERRIES, 1));
|
||
|
|
+ }
|
||
|
|
+ // CraftBukkit end
|
||
|
|
+
|
||
|
|
float f = MathHelper.b(world.random, 0.8F, 1.2F);
|
||
|
|
|
||
|
|
world.playSound((EntityHuman) null, blockposition, SoundEffects.CAVE_VINES_PICK_BERRIES, SoundCategory.BLOCKS, 1.0F, f);
|
||
|
|
+ // CraftBukkit start - call EntityChangeBlockEvent
|
||
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entity, blockposition, (IBlockData) iblockdata.set(CaveVines.BERRIES, false)).isCancelled()) {
|
||
|
|
+ return EnumInteractionResult.SUCCESS;
|
||
|
|
+ }
|
||
|
|
+ // CraftBukkit end
|
||
|
|
world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(CaveVines.BERRIES, false), 2);
|
||
|
|
return EnumInteractionResult.a(world.isClientSide);
|
||
|
|
} else {
|