Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-19 18:31:18 +02:00
Code Issues Projects Releases Wiki Activity

SPIGOT-1536: Fix playNote

Browse Source
This commit is contained in:
md_5 2016-03-01 13:42:54 +11:00
parent 3879b98ac2
commit fdaa09b23b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@ -251,7 +251,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
instrumentName = "harp"; instrumentName = "harp";
break; break;
case 1: case 1:
instrumentName = "bd"; instrumentName = "basedrum";
break; break;
case 2: case 2:
instrumentName = "snare"; instrumentName = "snare";
@ -260,12 +260,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
instrumentName = "hat"; instrumentName = "hat";
break; break;
case 4: case 4:
instrumentName = "bassattack"; instrumentName = "bass";
break; break;
} }
float f = (float) Math.pow(2.0D, (note - 12.0D) / 12.0D); float f = (float) Math.pow(2.0D, (note - 12.0D) / 12.0D);
getHandle().playerConnection.sendPacket(new PacketPlayOutNamedSoundEffect(CraftSound.getSoundEffect("note." + instrumentName), SoundCategory.MUSIC, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), 3.0f, f)); getHandle().playerConnection.sendPacket(new PacketPlayOutNamedSoundEffect(CraftSound.getSoundEffect("block.note." + instrumentName), SoundCategory.MUSIC, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), 3.0f, f));
} }
@Override @Override
@ -278,7 +278,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
instrumentName = "harp"; instrumentName = "harp";
break; break;
case 1: case 1:
instrumentName = "bd"; instrumentName = "basedrum";
break; break;
case 2: case 2:
instrumentName = "snare"; instrumentName = "snare";
@ -287,11 +287,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
instrumentName = "hat"; instrumentName = "hat";
break; break;
case 4: case 4:
instrumentName = "bassattack"; instrumentName = "bass";
break; break;
} }
float f = (float) Math.pow(2.0D, (note.getId() - 12.0D) / 12.0D); float f = (float) Math.pow(2.0D, (note.getId() - 12.0D) / 12.0D);
getHandle().playerConnection.sendPacket(new PacketPlayOutNamedSoundEffect(CraftSound.getSoundEffect("note." + instrumentName), SoundCategory.MUSIC, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), 3.0f, f)); getHandle().playerConnection.sendPacket(new PacketPlayOutNamedSoundEffect(CraftSound.getSoundEffect("block.note." + instrumentName), SoundCategory.MUSIC, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), 3.0f, f));
} }
@Override @Override