diff options
author | feildmaster <admin@feildmaster.com> | 2012-07-29 02:33:13 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2012-08-02 04:58:50 -0500 |
commit | a43d621c0138110d2ec362b2eaa8f938f241bb49 (patch) | |
tree | d2ebc0d7a4a969d3257b1b958236428a24117eb1 /src/main/java/net/minecraft/server/BlockMinecartDetector.java | |
parent | 08e2923bd4282579ca0cf7af0e6207cba0591e5c (diff) | |
download | craftbukkit-a43d621c0138110d2ec362b2eaa8f938f241bb49.tar craftbukkit-a43d621c0138110d2ec362b2eaa8f938f241bb49.tar.gz craftbukkit-a43d621c0138110d2ec362b2eaa8f938f241bb49.tar.lz craftbukkit-a43d621c0138110d2ec362b2eaa8f938f241bb49.tar.xz craftbukkit-a43d621c0138110d2ec362b2eaa8f938f241bb49.zip |
Update CraftBukkit to Minecraft 1.3.1
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockMinecartDetector.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockMinecartDetector.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/main/java/net/minecraft/server/BlockMinecartDetector.java b/src/main/java/net/minecraft/server/BlockMinecartDetector.java index 5f4bb85d..b5689bfa 100644 --- a/src/main/java/net/minecraft/server/BlockMinecartDetector.java +++ b/src/main/java/net/minecraft/server/BlockMinecartDetector.java @@ -9,10 +9,10 @@ public class BlockMinecartDetector extends BlockMinecartTrack { public BlockMinecartDetector(int i, int j) { super(i, j, true); - this.a(true); + this.b(true); } - public int d() { + public int p_() { return 20; } @@ -25,17 +25,17 @@ public class BlockMinecartDetector extends BlockMinecartTrack { int l = world.getData(i, j, k); if ((l & 8) == 0) { - this.f(world, i, j, k, l); + this.e(world, i, j, k, l); } } } - public void a(World world, int i, int j, int k, Random random) { + public void b(World world, int i, int j, int k, Random random) { if (!world.isStatic) { int l = world.getData(i, j, k); if ((l & 8) != 0) { - this.f(world, i, j, k, l); + this.e(world, i, j, k, l); } } } @@ -44,17 +44,17 @@ public class BlockMinecartDetector extends BlockMinecartTrack { return (iblockaccess.getData(i, j, k) & 8) != 0; } - public boolean d(World world, int i, int j, int k, int l) { + public boolean c(World world, int i, int j, int k, int l) { return (world.getData(i, j, k) & 8) == 0 ? false : l == 1; } - private void f(World world, int i, int j, int k, int l) { + private void e(World world, int i, int j, int k, int l) { boolean flag = (l & 8) != 0; boolean flag1 = false; float f = 0.125F; - List list = world.a(EntityMinecart.class, AxisAlignedBB.b((double) ((float) i + f), (double) j, (double) ((float) k + f), (double) ((float) (i + 1) - f), (double) ((float) (j + 1) - f), (double) ((float) (k + 1) - f))); + List list = world.a(EntityMinecart.class, AxisAlignedBB.a().a((double) ((float) i + f), (double) j, (double) ((float) k + f), (double) ((float) (i + 1) - f), (double) ((float) (j + 1) - f), (double) ((float) (k + 1) - f))); - if (list.size() > 0) { + if (!list.isEmpty()) { flag1 = true; } @@ -73,18 +73,18 @@ public class BlockMinecartDetector extends BlockMinecartTrack { world.setData(i, j, k, l | 8); world.applyPhysics(i, j, k, this.id); world.applyPhysics(i, j - 1, k, this.id); - world.b(i, j, k, i, j, k); + world.d(i, j, k, i, j, k); } if (!flag1 && flag) { world.setData(i, j, k, l & 7); world.applyPhysics(i, j, k, this.id); world.applyPhysics(i, j - 1, k, this.id); - world.b(i, j, k, i, j, k); + world.d(i, j, k, i, j, k); } if (flag1) { - world.c(i, j, k, this.id, this.d()); + world.a(i, j, k, this.id, this.p_()); } } } |