--- a/net/minecraft/world/level/block/BlockCactus.java +++ b/net/minecraft/world/level/block/BlockCactus.java @@ -23,6 +23,8 @@ import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraft.world.phys.shapes.VoxelShapeCollision; +import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit + public class BlockCactus extends Block { public static final BlockStateInteger AGE = BlockProperties.aj; @@ -57,7 +59,7 @@ int j = (Integer) iblockdata.get(BlockCactus.AGE); if (j == 15) { - worldserver.setTypeUpdate(blockposition1, this.getBlockData()); + CraftEventFactory.handleBlockGrowEvent(worldserver, blockposition1, this.getBlockData()); // CraftBukkit IBlockData iblockdata1 = (IBlockData) iblockdata.set(BlockCactus.AGE, 0); worldserver.setTypeAndData(blockposition, iblockdata1, 4); @@ -114,7 +116,9 @@ @Override public void a(IBlockData iblockdata, World world, BlockPosition blockposition, Entity entity) { + CraftEventFactory.blockDamage = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); // CraftBukkit entity.damageEntity(DamageSource.CACTUS, 1.0F); + CraftEventFactory.blockDamage = null; // CraftBukkit } @Override