|
16 | 16 | if (io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableNoteblockUpdates) return state; // Paper - prevent noteblock instrument from updating |
17 | 17 | boolean flag = direction.getAxis() == Direction.Axis.Y; |
18 | 18 | return flag |
19 | | -@@ -94,6 +_,7 @@ |
20 | | - |
21 | | - @Override |
22 | | - protected void neighborChanged(BlockState state, Level level, BlockPos pos, Block neighborBlock, @Nullable Orientation orientation, boolean movedByPiston) { |
23 | | -+ if (!new gg.projecteden.parchment.event.block.CustomBlockUpdateEvent(org.bukkit.craftbukkit.block.data.CraftBlockData.fromData(this.defaultBlockState()), gg.projecteden.parchment.event.block.CustomBlockUpdateEvent.UpdateType.POWERED, org.bukkit.craftbukkit.util.CraftLocation.toBukkit(pos, level)).callEvent()) return; |
| 19 | +@@ -97,6 +_,7 @@ |
24 | 20 | if (io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableNoteblockUpdates) return; // Paper - prevent noteblock powered-state from updating |
25 | 21 | boolean hasNeighborSignal = level.hasNeighborSignal(pos); |
26 | 22 | if (hasNeighborSignal != state.getValue(POWERED)) { |
27 | | -@@ -125,7 +_,9 @@ |
| 23 | ++ if (!new gg.projecteden.parchment.event.block.CustomBlockUpdateEvent(org.bukkit.craftbukkit.block.data.CraftBlockData.fromData(this.defaultBlockState()), gg.projecteden.parchment.event.block.CustomBlockUpdateEvent.UpdateType.POWERED, org.bukkit.craftbukkit.util.CraftLocation.toBukkit(pos, level)).callEvent()) return; |
| 24 | + if (hasNeighborSignal) { |
| 25 | + this.playNote(null, state, level, pos); |
| 26 | + state = level.getBlockState(pos); // CraftBukkit - SPIGOT-5617: update in case changed in event |
| 27 | +@@ -125,7 +_,11 @@ |
28 | 28 | @Override |
29 | 29 | protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hitResult) { |
30 | 30 | if (!level.isClientSide) { |
31 | 31 | - if (!io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableNoteblockUpdates) state = state.cycle(NoteBlock.NOTE); // Paper - prevent noteblock note from updating |
32 | | -+ if (!io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableNoteblockUpdates || |
33 | | -+ !new gg.projecteden.parchment.event.block.CustomBlockUpdateEvent(org.bukkit.craftbukkit.block.data.CraftBlockData.fromData(this.defaultBlockState()), gg.projecteden.parchment.event.block.CustomBlockUpdateEvent.UpdateType.PITCH, org.bukkit.craftbukkit.util.CraftLocation.toBukkit(pos, level)).callEvent()) |
| 32 | ++ if (!new gg.projecteden.parchment.event.block.CustomBlockUpdateEvent(org.bukkit.craftbukkit.block.data.CraftBlockData.fromData(this.defaultBlockState()), gg.projecteden.parchment.event.block.CustomBlockUpdateEvent.UpdateType.PITCH, org.bukkit.craftbukkit.util.CraftLocation.toBukkit(pos, level)).callEvent()) |
| 33 | ++ return InteractionResult.SUCCESS; |
| 34 | ++ |
| 35 | ++ if (!io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableNoteblockUpdates) |
34 | 36 | + state = (BlockState) state.cycle(NoteBlock.NOTE); // Paper - prevent noteblock note from updating |
35 | 37 | level.setBlock(pos, state, 3); |
36 | 38 | this.playNote(player, state, level, pos); |
|
0 commit comments