--- a/net/minecraft/world/level/block/BlockNote.java +++ b/net/minecraft/world/level/block/BlockNote.java @@ -48,7 +48,8 @@ if (flag1 != (Boolean) iblockdata.getValue(BlockNote.POWERED)) { if (flag1) { - this.playNote(world, blockposition); + this.playNote(world, blockposition, iblockdata); // CraftBukkit + iblockdata = world.getBlockState(blockposition); // CraftBukkit - SPIGOT-5617: update in case changed in event } world.setBlock(blockposition, (IBlockData) iblockdata.setValue(BlockNote.POWERED, flag1), 3); @@ -56,9 +57,14 @@ } - private void playNote(World world, BlockPosition blockposition) { + private void playNote(World world, BlockPosition blockposition, IBlockData data) { // CraftBukkit if (world.getBlockState(blockposition.above()).isAir()) { - world.blockEvent(blockposition, this, 0, 0); + // CraftBukkit start + org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, blockposition, data.getValue(BlockNote.INSTRUMENT), data.getValue(BlockNote.NOTE)); + if (!event.isCancelled()) { + world.blockEvent(blockposition, this, 0, 0); + } + // CraftBukkit end } } @@ -70,7 +76,7 @@ } else { iblockdata = (IBlockData) iblockdata.cycle(BlockNote.NOTE); world.setBlock(blockposition, iblockdata, 3); - this.playNote(world, blockposition); + this.playNote(world, blockposition, iblockdata); // CraftBukkit entityhuman.awardStat(StatisticList.TUNE_NOTEBLOCK); return EnumInteractionResult.CONSUME; } @@ -79,7 +85,7 @@ @Override public void attack(IBlockData iblockdata, World world, BlockPosition blockposition, EntityHuman entityhuman) { if (!world.isClientSide) { - this.playNote(world, blockposition); + this.playNote(world, blockposition, iblockdata); // CraftBukkit entityhuman.awardStat(StatisticList.PLAY_NOTEBLOCK); } }