52 lines
2.9 KiB
Diff
52 lines
2.9 KiB
Diff
--- a/net/minecraft/world/level/block/BlockSweetBerryBush.java
|
|
+++ b/net/minecraft/world/level/block/BlockSweetBerryBush.java
|
|
@@ -30,6 +30,13 @@
|
|
import net.minecraft.world.phys.shapes.VoxelShapeCollision;
|
|
import net.minecraft.world.phys.shapes.VoxelShapes;
|
|
|
|
+// CraftBukkit start
|
|
+import java.util.Collections;
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
|
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
|
|
+import org.bukkit.event.player.PlayerHarvestBlockEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class BlockSweetBerryBush extends VegetationBlock implements IBlockFragilePlantElement {
|
|
|
|
public static final MapCodec<BlockSweetBerryBush> CODEC = simpleCodec(BlockSweetBerryBush::new);
|
|
@@ -84,7 +91,7 @@
|
|
if (i < 3 && randomsource.nextInt(5) == 0 && worldserver.getRawBrightness(blockposition.above(), 0) >= 9) {
|
|
IBlockData iblockdata1 = (IBlockData) iblockdata.setValue(BlockSweetBerryBush.AGE, i + 1);
|
|
|
|
- worldserver.setBlock(blockposition, iblockdata1, 2);
|
|
+ if (!CraftEventFactory.handleBlockGrowEvent(worldserver, blockposition, iblockdata1, 2)) return; // CraftBukkit
|
|
worldserver.gameEvent(GameEvent.BLOCK_CHANGE, blockposition, GameEvent.a.of(iblockdata1));
|
|
}
|
|
|
|
@@ -105,7 +112,7 @@
|
|
double d1 = Math.abs(vec3d.z());
|
|
|
|
if (d0 >= (double) 0.003F || d1 >= (double) 0.003F) {
|
|
- entity.hurtServer(worldserver, world.damageSources().sweetBerryBush(), 1.0F);
|
|
+ entity.hurtServer(worldserver, world.damageSources().sweetBerryBush().directBlock(world, blockposition), 1.0F); // CraftBukkit
|
|
}
|
|
}
|
|
|
|
@@ -132,7 +139,15 @@
|
|
if (i > 1) {
|
|
int j = 1 + world.random.nextInt(2);
|
|
|
|
- popResource(world, blockposition, new ItemStack(Items.SWEET_BERRIES, j + (flag ? 1 : 0)));
|
|
+ // CraftBukkit start - useWithoutItem is always MAIN_HAND
|
|
+ PlayerHarvestBlockEvent event = CraftEventFactory.callPlayerHarvestBlockEvent(world, blockposition, entityhuman, EnumHand.MAIN_HAND, Collections.singletonList(new ItemStack(Items.SWEET_BERRIES, j + (flag ? 1 : 0))));
|
|
+ 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()) {
|
|
+ popResource(world, blockposition, CraftItemStack.asNMSCopy(itemStack));
|
|
+ }
|
|
+ // CraftBukkit end
|
|
world.playSound((Entity) null, blockposition, SoundEffects.SWEET_BERRY_BUSH_PICK_BERRIES, SoundCategory.BLOCKS, 1.0F, 0.8F + world.random.nextFloat() * 0.4F);
|
|
IBlockData iblockdata1 = (IBlockData) iblockdata.setValue(BlockSweetBerryBush.AGE, 1);
|
|
|