MOOOOOOOOOOORE

1 files changed, 57 insertions, 0 deletions

diff --git a/patches/server/0771-fix-Instruments.patch b/patches/server/0771-fix-Instruments.patch
new file mode 100644
index 0000000000..215623c640
--- /dev/null
+++ b/patches/server/0771-fix-Instruments.patch
@@ -0,0 +1,57 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Fri, 9 Dec 2022 01:47:23 -0800
+Subject: [PATCH] fix Instruments
+
+properly handle Player#playNote
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+index 2c38725e6fc0a264df3a0d34c21ab774ad3e2fb5..2a0ca017130a76aff3f15064a334cc0be501d782 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+@@ -781,7 +781,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+         Sound instrumentSound = instrument.getSound();
+         if (instrumentSound == null) return;
+ 
+-        float pitch = note.getPitch();
++        // Paper start - use correct pitch (modeled off of NoteBlock)
++        final net.minecraft.world.level.block.state.properties.NoteBlockInstrument noteBlockInstrument = CraftBlockData.toNMS(instrument, net.minecraft.world.level.block.state.properties.NoteBlockInstrument.class);
++        final float pitch = noteBlockInstrument.isTunable() ? note.getPitch() : 1.0f;
++        // Paper end
+         this.getHandle().connection.send(new ClientboundSoundPacket(CraftSound.bukkitToMinecraftHolder(instrumentSound), net.minecraft.sounds.SoundSource.RECORDS, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), 3.0f, pitch, this.getHandle().getRandom().nextLong()));
+     }
+ 
+diff --git a/src/test/java/io/papermc/paper/block/InstrumentSoundTest.java b/src/test/java/io/papermc/paper/block/InstrumentSoundTest.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..cd718ed01ba5d448cdf0a2b6a39dc7ef2337f70d
+--- /dev/null
++++ b/src/test/java/io/papermc/paper/block/InstrumentSoundTest.java
+@@ -0,0 +1,28 @@
++package io.papermc.paper.block;
++
++import java.util.Arrays;
++import java.util.stream.Stream;
++import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
++import org.bukkit.Instrument;
++import org.bukkit.craftbukkit.CraftSound;
++import org.bukkit.craftbukkit.block.data.CraftBlockData;
++import org.bukkit.support.environment.AllFeatures;
++import org.junit.jupiter.params.ParameterizedTest;
++import org.junit.jupiter.params.provider.MethodSource;
++
++import static org.junit.jupiter.api.Assertions.assertEquals;
++
++@AllFeatures
++class InstrumentSoundTest {
++
++    static Stream<Instrument> bukkitInstruments() {
++        return Arrays.stream(Instrument.values()).filter(i -> i.getSound() != null);
++    }
++
++    @ParameterizedTest
++    @MethodSource("bukkitInstruments")
++    void checkInstrumentSound(final Instrument bukkit) {
++        final NoteBlockInstrument nms = CraftBlockData.toNMS(bukkit, NoteBlockInstrument.class);
++        assertEquals(nms.getSoundEvent(), CraftSound.bukkitToMinecraftHolder(bukkit.getSound()));
++    }
++}