--- a/net/minecraft/server/TileEntityNote.java
+++ b/net/minecraft/server/TileEntityNote.java
@@ -44,7 +44,12 @@
                 b0 = 4;
             }
 
-            world.playBlockAction(blockposition, Blocks.NOTEBLOCK, b0, this.note);
+            // CraftBukkit start
+            org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(this.world, blockposition.getX(), blockposition.getY(), blockposition.getZ(), b0, this.note);
+            if (!event.isCancelled()) {
+                world.playBlockAction(blockposition, Blocks.NOTEBLOCK, event.getInstrument().getType(), event.getNote().getId());
+            }
+            // CraftBukkit end
         }
     }
 }