diff options
| author | md_5 <git@md-5.net> | 2016-03-01 13:42:54 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-03-01 13:42:54 +1100 |
| commit | fdaa09b23b4d086ef1c8c07abf9eb4f381865107 (patch) | |
| tree | 967d75ca59e1f5273a27f1a319a0d632bee17711 /src | |
| parent | 3879b98ac23ca9c473e9cfd7d8e51b66a272b968 (diff) | |
| download | craftbukkit-fdaa09b23b4d086ef1c8c07abf9eb4f381865107.tar craftbukkit-fdaa09b23b4d086ef1c8c07abf9eb4f381865107.tar.gz craftbukkit-fdaa09b23b4d086ef1c8c07abf9eb4f381865107.tar.lz craftbukkit-fdaa09b23b4d086ef1c8c07abf9eb4f381865107.tar.xz craftbukkit-fdaa09b23b4d086ef1c8c07abf9eb4f381865107.zip | |
SPIGOT-1536: Fix playNote
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index fb81a28d..9a0835d7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -251,7 +251,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { instrumentName = "harp"; break; case 1: - instrumentName = "bd"; + instrumentName = "basedrum"; break; case 2: instrumentName = "snare"; @@ -260,12 +260,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { instrumentName = "hat"; break; case 4: - instrumentName = "bassattack"; + instrumentName = "bass"; break; } 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 @@ -278,7 +278,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { instrumentName = "harp"; break; case 1: - instrumentName = "bd"; + instrumentName = "basedrum"; break; case 2: instrumentName = "snare"; @@ -287,11 +287,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { instrumentName = "hat"; break; case 4: - instrumentName = "bassattack"; + instrumentName = "bass"; break; } 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 |