diff options
author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-02-23 02:37:56 +0000 |
---|---|---|
committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-02-23 02:37:56 +0000 |
commit | f759e0b60d3a575d31921c930e436af321b0e7e8 (patch) | |
tree | 4b1eb7ac01670854c686b1f6faa2f97ff337f7d7 /src/main/java/net/minecraft/server/BlockRedstoneTorch.java | |
parent | a124bfdab59cc9a9d8369425027e61eccd1d62fb (diff) | |
download | craftbukkit-f759e0b60d3a575d31921c930e436af321b0e7e8.tar craftbukkit-f759e0b60d3a575d31921c930e436af321b0e7e8.tar.gz craftbukkit-f759e0b60d3a575d31921c930e436af321b0e7e8.tar.lz craftbukkit-f759e0b60d3a575d31921c930e436af321b0e7e8.tar.xz craftbukkit-f759e0b60d3a575d31921c930e436af321b0e7e8.zip |
Update to Minecraft 1.3 beta
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockRedstoneTorch.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockRedstoneTorch.java | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java index d745686f..4733f78b 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java @@ -14,9 +14,13 @@ public class BlockRedstoneTorch extends BlockTorch { private boolean a = false; private static List b = new ArrayList(); + public int a(int i, int j) { + return i == 1 ? Block.REDSTONE_WIRE.a(i, j) : super.a(i, j); + } + private boolean a(World world, int i, int j, int k, boolean flag) { if (flag) { - b.add(new RedstoneUpdateInfo(i, j, k, world.e)); + b.add(new RedstoneUpdateInfo(i, j, k, world.k())); } int l = 0; @@ -84,13 +88,13 @@ public class BlockRedstoneTorch extends BlockTorch { private boolean g(World world, int i, int j, int k) { int l = world.getData(i, j, k); - return l == 5 && world.k(i, j - 1, k, 0) ? true : (l == 3 && world.k(i, j, k - 1, 2) ? true : (l == 4 && world.k(i, j, k + 1, 3) ? true : (l == 1 && world.k(i - 1, j, k, 4) ? true : l == 2 && world.k(i + 1, j, k, 5)))); + return l == 5 && world.j(i, j - 1, k, 0) ? true : (l == 3 && world.j(i, j, k - 1, 2) ? true : (l == 4 && world.j(i, j, k + 1, 3) ? true : (l == 1 && world.j(i - 1, j, k, 4) ? true : l == 2 && world.j(i + 1, j, k, 5)))); } public void a(World world, int i, int j, int k, Random random) { boolean flag = this.g(world, i, j, k); - while (b.size() > 0 && world.e - ((RedstoneUpdateInfo) b.get(0)).d > 100L) { + while (b.size() > 0 && world.k() - ((RedstoneUpdateInfo) b.get(0)).d > 100L) { b.remove(0); } @@ -107,7 +111,7 @@ public class BlockRedstoneTorch extends BlockTorch { if (flag) { world.b(i, j, k, Block.REDSTONE_TORCH_OFF.id, world.getData(i, j, k)); if (this.a(world, i, j, k, true)) { - world.a((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), "random.fizz", 0.5F, 2.6F + (world.l.nextFloat() - world.l.nextFloat()) * 0.8F); + world.a((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), "random.fizz", 0.5F, 2.6F + (world.k.nextFloat() - world.k.nextFloat()) * 0.8F); for (int l = 0; l < 5; ++l) { double d0 = (double) i + random.nextDouble() * 0.6D + 0.2D; @@ -123,13 +127,13 @@ public class BlockRedstoneTorch extends BlockTorch { } } - public void b(World world, int i, int j, int k, int l) { - super.b(world, i, j, k, l); - world.i(i, j, k, this.id); + public void a(World world, int i, int j, int k, int l) { + super.a(world, i, j, k, l); + world.c(i, j, k, this.id, this.b()); } - public boolean d(World world, int i, int j, int k, int l) { - return l == 0 ? this.b((IBlockAccess) world, i, j, k, l) : false; + public boolean c(World world, int i, int j, int k, int l) { + return l == 0 ? this.b((IBlockAccess) world, i, j, k, l) : false; // CraftBukkit -- cast to IBlockAccess } public int a(int i, Random random) { |