diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockStationary.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockStationary.java | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/main/java/net/minecraft/server/BlockStationary.java b/src/main/java/net/minecraft/server/BlockStationary.java index a3a266d7..d9ef03fe 100644 --- a/src/main/java/net/minecraft/server/BlockStationary.java +++ b/src/main/java/net/minecraft/server/BlockStationary.java @@ -11,41 +11,41 @@ public class BlockStationary extends BlockFluids { protected BlockStationary(int i, Material material) { super(i, material); - this.a(false); + this.b(false); if (material == Material.LAVA) { - this.a(true); + this.b(true); } } - public boolean b(IBlockAccess iblockaccess, int i, int j, int k) { + public boolean c(IBlockAccess iblockaccess, int i, int j, int k) { return this.material != Material.LAVA; } public void doPhysics(World world, int i, int j, int k, int l) { super.doPhysics(world, i, j, k, l); if (world.getTypeId(i, j, k) == this.id) { - this.i(world, i, j, k); + this.l(world, i, j, k); } } - private void i(World world, int i, int j, int k) { + private void l(World world, int i, int j, int k) { int l = world.getData(i, j, k); world.suppressPhysics = true; world.setRawTypeIdAndData(i, j, k, this.id - 1, l); - world.b(i, j, k, i, j, k); - world.c(i, j, k, this.id - 1, this.d()); + world.d(i, j, k, i, j, k); + world.a(i, j, k, this.id - 1, this.p_()); world.suppressPhysics = false; } - 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 (this.material == Material.LAVA) { int l = random.nextInt(3); int i1; int j1; - // CraftBukkit start - prevent lava putting something on fire. + // CraftBukkit start - prevent lava putting something on fire org.bukkit.World bworld = world.getWorld(); BlockIgniteEvent.IgniteCause igniteCause = BlockIgniteEvent.IgniteCause.LAVA; // CraftBukkit end @@ -56,8 +56,8 @@ public class BlockStationary extends BlockFluids { k += random.nextInt(3) - 1; j1 = world.getTypeId(i, j, k); if (j1 == 0) { - if (this.j(world, i - 1, j, k) || this.j(world, i + 1, j, k) || this.j(world, i, j, k - 1) || this.j(world, i, j, k + 1) || this.j(world, i, j - 1, k) || this.j(world, i, j + 1, k)) { - // CraftBukkit start - prevent lava putting something on fire. + if (this.n(world, i - 1, j, k) || this.n(world, i + 1, j, k) || this.n(world, i, j, k - 1) || this.n(world, i, j, k + 1) || this.n(world, i, j - 1, k) || this.n(world, i, j + 1, k)) { + // CraftBukkit start - prevent lava putting something on fire org.bukkit.block.Block block = bworld.getBlockAt(i, j, k); if (block.getTypeId() != Block.FIRE.id) { if (CraftEventFactory.callEvent(new BlockIgniteEvent(block, igniteCause, null)).isCancelled()) { @@ -81,8 +81,8 @@ public class BlockStationary extends BlockFluids { for (int k1 = 0; k1 < 3; ++k1) { i = i1 + random.nextInt(3) - 1; k = j1 + random.nextInt(3) - 1; - if (world.isEmpty(i, j + 1, k) && this.j(world, i, j, k)) { - // CraftBukkit start - prevent lava putting something on fire. + if (world.isEmpty(i, j + 1, k) && this.n(world, i, j, k)) { + // CraftBukkit start - prevent lava putting something on fire org.bukkit.block.Block block = bworld.getBlockAt(i, j + 1, k); if (block.getTypeId() != Block.FIRE.id) { if (CraftEventFactory.callEvent(new BlockIgniteEvent(block, igniteCause, null)).isCancelled()) { @@ -98,7 +98,7 @@ public class BlockStationary extends BlockFluids { } } - private boolean j(World world, int i, int j, int k) { + private boolean n(World world, int i, int j, int k) { return world.getMaterial(i, j, k).isBurnable(); } } |