Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 12:27:59 +01:00
Code Issues Projects Releases Wiki Activity

fix Instruments

Browse Source 
properly handle Player#playNote
This commit is contained in:
Jake Potrebic 2022-12-09 01:47:23 -08:00
parent 21770104ec
commit 2b90721a45
3 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@ -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()));
}

28
paper-server/src/test/java/io/papermc/paper/block/InstrumentSoundTest.java Normal file
View File

@ -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()));
}
}

20
paper-server/src/test/java/org/bukkit/InstrumentTest.java Normal file
View File

@ -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));
}
}
}