mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-03 14:57:35 +01:00
89d51d5f29
Because this exploit has been widely known for years and has not been fixed by Mojang, we decided that it was worth allowing people to toggle it on/off due to how easy it is to make it configurable. It should be noted that this decision does not promise all future exploits will be configurable.
55 lines
3.6 KiB
Diff
55 lines
3.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Kieran Wallbanks <kieran.wallbanks@gmail.com>
|
|
Date: Mon, 21 Jun 2021 14:23:50 +0100
|
|
Subject: [PATCH] Fix NotePlayEvent
|
|
|
|
== AT ==
|
|
public org.bukkit.craftbukkit.block.data.CraftBlockData toNMS(Ljava/lang/Enum;Ljava/lang/Class;)Ljava/lang/Enum;
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/NoteBlock.java b/src/main/java/net/minecraft/world/level/block/NoteBlock.java
|
|
index 43fbdca9422b679c210bc556e2d48ad37babbe8b..92a24cf02f15f3ab893eb9a793770d9819e4f600 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/NoteBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/NoteBlock.java
|
|
@@ -93,11 +93,12 @@ public class NoteBlock extends Block {
|
|
private void playNote(@Nullable Entity entity, BlockState state, Level world, BlockPos pos) {
|
|
if (((NoteBlockInstrument) state.getValue(NoteBlock.INSTRUMENT)).worksAboveNoteBlock() || world.getBlockState(pos.above()).isAir()) {
|
|
// CraftBukkit start
|
|
- org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, pos, state.getValue(NoteBlock.INSTRUMENT), state.getValue(NoteBlock.NOTE));
|
|
- if (event.isCancelled()) {
|
|
- return;
|
|
- }
|
|
+ // org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, pos, state.getValue(NoteBlock.INSTRUMENT), state.getValue(NoteBlock.NOTE));
|
|
+ // if (event.isCancelled()) {
|
|
+ // return;
|
|
+ // }
|
|
// CraftBukkit end
|
|
+ // Paper - move NotePlayEvent call to fix instrument/note changes; TODO any way to cancel the game event?
|
|
world.blockEvent(pos, this, 0, 0);
|
|
world.gameEvent(entity, GameEvent.NOTE_BLOCK_PLAY, pos);
|
|
}
|
|
@@ -136,10 +137,14 @@ public class NoteBlock extends Block {
|
|
@Override
|
|
public boolean triggerEvent(BlockState state, Level world, BlockPos pos, int type, int data) {
|
|
NoteBlockInstrument blockpropertyinstrument = (NoteBlockInstrument) state.getValue(NoteBlock.INSTRUMENT);
|
|
+ // Paper start - move NotePlayEvent call to fix instrument/note changes
|
|
+ org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, pos, blockpropertyinstrument, state.getValue(NOTE));
|
|
+ if (event.isCancelled()) return false;
|
|
+ // Paper end - move NotePlayEvent call to fix instrument/note changes
|
|
float f;
|
|
|
|
if (blockpropertyinstrument.isTunable()) {
|
|
- int k = (Integer) state.getValue(NoteBlock.NOTE);
|
|
+ int k = event.getNote().getId(); // Paper - move NotePlayEvent call to fix instrument/note changes
|
|
|
|
f = NoteBlock.getPitchFromNote(k);
|
|
world.addParticle(ParticleTypes.NOTE, (double) pos.getX() + 0.5D, (double) pos.getY() + 1.2D, (double) pos.getZ() + 0.5D, (double) k / 24.0D, 0.0D, 0.0D);
|
|
@@ -158,7 +163,7 @@ public class NoteBlock extends Block {
|
|
|
|
holder = Holder.direct(SoundEvent.createVariableRangeEvent(minecraftkey));
|
|
} else {
|
|
- holder = blockpropertyinstrument.getSoundEvent();
|
|
+ holder = org.bukkit.craftbukkit.block.data.CraftBlockData.toNMS(event.getInstrument(), NoteBlockInstrument.class).getSoundEvent(); // Paper - move NotePlayEvent call to fix instrument/note changes
|
|
}
|
|
|
|
world.playSeededSound((Player) null, (double) pos.getX() + 0.5D, (double) pos.getY() + 0.5D, (double) pos.getZ() + 0.5D, holder, SoundSource.RECORDS, 3.0F, f, world.random.nextLong());
|