diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2013-03-13 17:33:27 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2013-03-15 13:28:59 -0500 |
commit | 83d29e461c85733f0113b6eb19db6e3b42da2949 (patch) | |
tree | b3063a1c28f478ab368d5ba3413a842def68c28f /src/main/java/net/minecraft/server/BlockReed.java | |
parent | ba6e4c38cfa98ad291974195cc46d70a4f138ac1 (diff) | |
download | craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.gz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.lz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.xz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.zip |
Update CraftBukkit to Minecraft 1.5
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockReed.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockReed.java | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java index 399050ab..86578601 100644 --- a/src/main/java/net/minecraft/server/BlockReed.java +++ b/src/main/java/net/minecraft/server/BlockReed.java @@ -4,16 +4,15 @@ import java.util.Random; public class BlockReed extends Block { - protected BlockReed(int i, int j) { + protected BlockReed(int i) { super(i, Material.PLANT); - this.textureId = j; float f = 0.375F; this.a(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 1.0F, 0.5F + f); this.b(true); } - public void b(World world, int i, int j, int k, Random random) { + public void a(World world, int i, int j, int k, Random random) { if (world.isEmpty(i, j + 1, k)) { int l; @@ -26,9 +25,9 @@ public class BlockReed extends Block { if (i1 == 15) { org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, i, j + 1, k, this.id, 0); // CraftBukkit - world.setData(i, j, k, 0); + world.setData(i, j, k, 0, 4); } else { - world.setData(i, j, k, i1 + 1); + world.setData(i, j, k, i1 + 1, 4); } } } @@ -41,21 +40,21 @@ public class BlockReed extends Block { } public void doPhysics(World world, int i, int j, int k, int l) { - this.k_(world, i, j, k); + this.p_(world, i, j, k); } - protected final void k_(World world, int i, int j, int k) { - if (!this.d(world, i, j, k)) { + protected final void p_(World world, int i, int j, int k) { + if (!this.f(world, i, j, k)) { this.c(world, i, j, k, world.getData(i, j, k), 0); - world.setTypeId(i, j, k, 0); + world.setAir(i, j, k); } } - public boolean d(World world, int i, int j, int k) { + public boolean f(World world, int i, int j, int k) { return this.canPlace(world, i, j, k); } - public AxisAlignedBB e(World world, int i, int j, int k) { + public AxisAlignedBB b(World world, int i, int j, int k) { return null; } |