mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-03 05:26:50 +01:00
47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
|
--- a/net/minecraft/server/BlockNote.java
|
||
|
|
+++ b/net/minecraft/server/BlockNote.java
|
||
|
|
@@ -24,7 +24,7 @@
|
||
|
|
|
||
|
|
if (flag != ((Boolean) iblockdata.get(BlockNote.POWERED)).booleanValue()) {
|
||
|
|
if (flag) {
|
||
|
|
- this.play(world, blockposition);
|
||
|
|
+ this.play(world, blockposition, iblockdata); // CraftBukkit
|
||
|
|
}
|
||
|
|
|
||
|
|
world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockNote.POWERED, Boolean.valueOf(flag)), 3);
|
||
|
|
@@ -32,9 +32,14 @@
|
||
|
|
|
||
|
|
}
|
||
|
|
|
||
|
|
- private void play(World world, BlockPosition blockposition) {
|
||
|
|
+ private void play(World world, BlockPosition blockposition, IBlockData data) { // CraftBukkit
|
||
|
|
if (world.getType(blockposition.up()).isAir()) {
|
||
|
|
- world.playBlockAction(blockposition, this, 0, 0);
|
||
|
|
+ // CraftBukkit start
|
||
|
|
+ org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, blockposition, data.get(BlockNote.INSTRUMENT), data.get(BlockNote.NOTE));
|
||
|
|
+ if (!event.isCancelled()) {
|
||
|
|
+ world.playBlockAction(blockposition, this, 0, 0);
|
||
|
|
+ }
|
||
|
|
+ // CraftBukkit end
|
||
|
|
}
|
||
|
|
|
||
|
|
}
|
||
|
|
@@ -45,7 +50,7 @@
|
||
|
|
} else {
|
||
|
|
iblockdata = (IBlockData) iblockdata.a((IBlockState) BlockNote.NOTE);
|
||
|
|
world.setTypeAndData(blockposition, iblockdata, 3);
|
||
|
|
- this.play(world, blockposition);
|
||
|
|
+ this.play(world, blockposition, iblockdata); // CraftBukkit
|
||
|
|
entityhuman.a(StatisticList.TUNE_NOTEBLOCK);
|
||
|
|
return true;
|
||
|
|
}
|
||
|
|
@@ -53,7 +58,7 @@
|
||
|
|
|
||
|
|
public void attack(IBlockData iblockdata, World world, BlockPosition blockposition, EntityHuman entityhuman) {
|
||
|
|
if (!world.isClientSide) {
|
||
|
|
- this.play(world, blockposition);
|
||
|
|
+ this.play(world, blockposition, iblockdata); // CraftBukkit
|
||
|
|
entityhuman.a(StatisticList.PLAY_NOTEBLOCK);
|
||
|
|
}
|
||
|
|
}
|