diff options
| author | mbax <matt@phozop.net> | 2013-11-04 07:07:38 -0600 |
|---|---|---|
| committer | Wesley Wolfe <weswolf@aol.com> | 2013-11-30 19:26:12 -0600 |
| commit | 2726696652179a5ead7dc07dd39edf7dfda687f7 (patch) | |
| tree | ff78e22fdd4fc01889a5f6cc482b599f965cd93a /src/main/java/net/minecraft/server/TileEntityNote.java | |
| parent | ff8b70fbb7a96b9d2ff078afcf3b3ff90f200981 (diff) | |
| download | craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.gz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.lz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.xz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.zip | |
Update CraftBukkit to Minecraft 1.7.2
Diffstat (limited to 'src/main/java/net/minecraft/server/TileEntityNote.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/TileEntityNote.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/TileEntityNote.java b/src/main/java/net/minecraft/server/TileEntityNote.java index 46bb08d1..b4292862 100644 --- a/src/main/java/net/minecraft/server/TileEntityNote.java +++ b/src/main/java/net/minecraft/server/TileEntityNote.java @@ -3,7 +3,7 @@ package net.minecraft.server; public class TileEntityNote extends TileEntity { public byte note; - public boolean b; + public boolean i; public TileEntityNote() {} @@ -30,8 +30,8 @@ public class TileEntityNote extends TileEntity { } public void play(World world, int i, int j, int k) { - if (world.getMaterial(i, j + 1, k) == Material.AIR) { - Material material = world.getMaterial(i, j - 1, k); + if (world.getType(i, j + 1, k).getMaterial() == Material.AIR) { + Material material = world.getType(i, j - 1, k).getMaterial(); byte b0 = 0; if (material == Material.STONE) { @@ -53,7 +53,7 @@ public class TileEntityNote extends TileEntity { // CraftBukkit start org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(this.world, i, j, k, b0, this.note); if (!event.isCancelled()) { - this.world.playNote(i, j, k, Block.NOTE_BLOCK.id, event.getInstrument().getType(), event.getNote().getId()); + this.world.playNote(i, j, k, Blocks.NOTE_BLOCK, event.getInstrument().getType(), event.getNote().getId()); } // CraftBukkit end } |