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/BlockSoil.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/BlockSoil.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockSoil.java | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/src/main/java/net/minecraft/server/BlockSoil.java b/src/main/java/net/minecraft/server/BlockSoil.java index 21641570..8da8e112 100644 --- a/src/main/java/net/minecraft/server/BlockSoil.java +++ b/src/main/java/net/minecraft/server/BlockSoil.java @@ -11,13 +11,12 @@ public class BlockSoil extends Block { protected BlockSoil(int i) { super(i, Material.EARTH); - this.textureId = 87; this.b(true); this.a(0.0F, 0.0F, 0.0F, 1.0F, 0.9375F, 1.0F); - this.h(255); + this.k(255); } - public AxisAlignedBB e(World world, int i, int j, int k) { + public AxisAlignedBB b(World world, int i, int j, int k) { return AxisAlignedBB.a().a((double) (i + 0), (double) (j + 0), (double) (k + 0), (double) (i + 1), (double) (j + 1), (double) (k + 1)); } @@ -29,17 +28,13 @@ public class BlockSoil extends Block { return false; } - public int a(int i, int j) { - return i == 1 && j > 0 ? this.textureId - 1 : (i == 1 ? this.textureId : 2); - } - - public void b(World world, int i, int j, int k, Random random) { - if (!this.n(world, i, j, k) && !world.D(i, j + 1, k)) { + public void a(World world, int i, int j, int k, Random random) { + if (!this.m(world, i, j, k) && !world.F(i, j + 1, k)) { int l = world.getData(i, j, k); if (l > 0) { - world.setData(i, j, k, l - 1); - } else if (!this.l(world, i, j, k)) { + world.setData(i, j, k, l - 1, 2); + } else if (!this.k(world, i, j, k)) { // CraftBukkit start org.bukkit.block.Block block = world.getWorld().getBlockAt(i, j, k); if (CraftEventFactory.callBlockFadeEvent(block, Block.DIRT.id).isCancelled()) { @@ -47,10 +42,10 @@ public class BlockSoil extends Block { } // CraftBukkit end - world.setTypeId(i, j, k, Block.DIRT.id); + world.setTypeIdUpdate(i, j, k, Block.DIRT.id); } } else { - world.setData(i, j, k, 7); + world.setData(i, j, k, 7, 2); } } @@ -74,11 +69,11 @@ public class BlockSoil extends Block { } // CraftBukkit end - world.setTypeId(i, j, k, Block.DIRT.id); + world.setTypeIdUpdate(i, j, k, Block.DIRT.id); } } - private boolean l(World world, int i, int j, int k) { + private boolean k(World world, int i, int j, int k) { byte b0 = 0; for (int l = i - b0; l <= i + b0; ++l) { @@ -94,7 +89,7 @@ public class BlockSoil extends Block { return false; } - private boolean n(World world, int i, int j, int k) { + private boolean m(World world, int i, int j, int k) { for (int l = i - 4; l <= i + 4; ++l) { for (int i1 = j; i1 <= j + 1; ++i1) { for (int j1 = k - 4; j1 <= k + 4; ++j1) { @@ -113,7 +108,7 @@ public class BlockSoil extends Block { Material material = world.getMaterial(i, j + 1, k); if (material.isBuildable()) { - world.setTypeId(i, j, k, Block.DIRT.id); + world.setTypeIdUpdate(i, j, k, Block.DIRT.id); } } |