From 2b90721a45c385f6a216e31f03f6000ba7b63ddd Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Fri, 9 Dec 2022 01:47:23 -0800
Subject: [PATCH] fix Instruments

properly handle Player#playNote
---
 .../craftbukkit/entity/CraftPlayer.java       |  5 +++-
 .../paper/block/InstrumentSoundTest.java      | 28 +++++++++++++++++++
 .../test/java/org/bukkit/InstrumentTest.java  | 20 +++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 paper-server/src/test/java/io/papermc/paper/block/InstrumentSoundTest.java
 create mode 100644 paper-server/src/test/java/org/bukkit/InstrumentTest.java

diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 844ff0a4e7..68329d9715 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -775,7 +775,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/paper-server/src/test/java/io/papermc/paper/block/InstrumentSoundTest.java b/paper-server/src/test/java/io/papermc/paper/block/InstrumentSoundTest.java
new file mode 100644
index 0000000000..cd718ed01b
--- /dev/null
+++ b/paper-server/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()));
+    }
+}
diff --git a/paper-server/src/test/java/org/bukkit/InstrumentTest.java b/paper-server/src/test/java/org/bukkit/InstrumentTest.java
new file mode 100644
index 0000000000..5da6b5c996
--- /dev/null
+++ b/paper-server/src/test/java/org/bukkit/InstrumentTest.java
@@ -0,0 +1,20 @@
+package org.bukkit;
+
+import org.bukkit.support.environment.AllFeatures;
+import org.junit.jupiter.api.Test;
+
+import static org.bukkit.support.MatcherAssert.assertThat;
+import static org.hamcrest.CoreMatchers.is;
+
+@AllFeatures
+public class InstrumentTest { // Paper - moved to internals as this test now access the sound registry.
+
+    @Test
+    public void getByType() {
+        for (Instrument instrument : Instrument.values()) {
+            // Paper - byte magic values are still used
+
+            assertThat(Instrument.getByType(instrument.getType()), is(instrument));
+        }
+    }
+}