diff options
author | mbax <matt@phozop.net> | 2013-11-04 07:07:38 -0600 |
---|---|---|
committer | Wesley Wolfe <weswolf@aol.com> | 2013-11-30 19:26:12 -0600 |
commit | 2726696652179a5ead7dc07dd39edf7dfda687f7 (patch) | |
tree | ff78e22fdd4fc01889a5f6cc482b599f965cd93a /src/main/java/net/minecraft/server/BlockDoor.java | |
parent | ff8b70fbb7a96b9d2ff078afcf3b3ff90f200981 (diff) | |
download | craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.gz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.lz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.xz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.zip |
Update CraftBukkit to Minecraft 1.7.2
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockDoor.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockDoor.java | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/src/main/java/net/minecraft/server/BlockDoor.java b/src/main/java/net/minecraft/server/BlockDoor.java index dea76145..046ffb8d 100644 --- a/src/main/java/net/minecraft/server/BlockDoor.java +++ b/src/main/java/net/minecraft/server/BlockDoor.java @@ -6,8 +6,8 @@ import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit public class BlockDoor extends Block { - protected BlockDoor(int i, Material material) { - super(i, material); + protected BlockDoor(Material material) { + super(material); float f = 0.5F; float f1 = 1.0F; @@ -19,37 +19,37 @@ public class BlockDoor extends Block { } public boolean b(IBlockAccess iblockaccess, int i, int j, int k) { - int l = this.c_(iblockaccess, i, j, k); + int l = this.g(iblockaccess, i, j, k); return (l & 4) != 0; } - public boolean b() { + public boolean d() { return false; } - public int d() { + public int b() { return 7; } - public AxisAlignedBB b(World world, int i, int j, int k) { + public AxisAlignedBB a(World world, int i, int j, int k) { this.updateShape(world, i, j, k); - return super.b(world, i, j, k); + return super.a(world, i, j, k); } public void updateShape(IBlockAccess iblockaccess, int i, int j, int k) { - this.d(this.c_(iblockaccess, i, j, k)); + this.b(this.g(iblockaccess, i, j, k)); } - public int d(IBlockAccess iblockaccess, int i, int j, int k) { - return this.c_(iblockaccess, i, j, k) & 3; + public int e(IBlockAccess iblockaccess, int i, int j, int k) { + return this.g(iblockaccess, i, j, k) & 3; } - public boolean b_(IBlockAccess iblockaccess, int i, int j, int k) { - return (this.c_(iblockaccess, i, j, k) & 4) != 0; + public boolean f(IBlockAccess iblockaccess, int i, int j, int k) { + return (this.g(iblockaccess, i, j, k) & 4) != 0; } - private void d(int i) { + private void b(int i) { float f = 0.1875F; this.a(0.0F, 0.0F, 0.0F, 1.0F, 2.0F, 1.0F); @@ -106,16 +106,16 @@ public class BlockDoor extends Block { if (this.material == Material.ORE) { return true; } else { - int i1 = this.c_(world, i, j, k); + int i1 = this.g(world, i, j, k); int j1 = i1 & 7; j1 ^= 4; if ((i1 & 8) == 0) { world.setData(i, j, k, j1, 2); - world.g(i, j, k, i, j, k); + world.c(i, j, k, i, j, k); } else { world.setData(i, j - 1, k, j1, 2); - world.g(i, j - 1, k, i, j, k); + world.c(i, j - 1, k, i, j, k); } world.a(entityhuman, 1003, i, j, k, 0); @@ -124,7 +124,7 @@ public class BlockDoor extends Block { } public void setDoor(World world, int i, int j, int k, boolean flag) { - int l = this.c_(world, i, j, k); + int l = this.g(world, i, j, k); boolean flag1 = (l & 4) != 0; if (flag1 != flag) { @@ -133,52 +133,52 @@ public class BlockDoor extends Block { i1 ^= 4; if ((l & 8) == 0) { world.setData(i, j, k, i1, 2); - world.g(i, j, k, i, j, k); + world.c(i, j, k, i, j, k); } else { world.setData(i, j - 1, k, i1, 2); - world.g(i, j - 1, k, i, j, k); + world.c(i, j - 1, k, i, j, k); } world.a((EntityHuman) null, 1003, i, j, k, 0); } } - public void doPhysics(World world, int i, int j, int k, int l) { - int i1 = world.getData(i, j, k); + public void doPhysics(World world, int i, int j, int k, Block block) { + int l = world.getData(i, j, k); - if ((i1 & 8) == 0) { + if ((l & 8) == 0) { boolean flag = false; - if (world.getTypeId(i, j + 1, k) != this.id) { + if (world.getType(i, j + 1, k) != this) { world.setAir(i, j, k); flag = true; } - if (!world.w(i, j - 1, k)) { + if (!World.a((IBlockAccess) world, i, j - 1, k)) { world.setAir(i, j, k); flag = true; - if (world.getTypeId(i, j + 1, k) == this.id) { + if (world.getType(i, j + 1, k) == this) { world.setAir(i, j + 1, k); } } if (flag) { if (!world.isStatic) { - this.c(world, i, j, k, i1, 0); + this.b(world, i, j, k, l, 0); } // CraftBukkit start - } else if (l > 0 && Block.byId[l].isPowerSource()) { + } else if (l > 0 && Block.e(l).isPowerSource()) { org.bukkit.World bworld = world.getWorld(); - org.bukkit.block.Block block = bworld.getBlockAt(i, j, k); + org.bukkit.block.Block bukkitBlock = bworld.getBlockAt(i, j, k); org.bukkit.block.Block blockTop = bworld.getBlockAt(i, j + 1, k); - int power = block.getBlockPower(); + int power = bukkitBlock.getBlockPower(); int powerTop = blockTop.getBlockPower(); if (powerTop > power) power = powerTop; int oldPower = (world.getData(i, j, k) & 4) > 0 ? 15 : 0; if (oldPower == 0 ^ power == 0) { - BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, oldPower, power); + BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(bukkitBlock, oldPower, power); world.getServer().getPluginManager().callEvent(eventRedstone); this.setDoor(world, i, j, k, eventRedstone.getNewCurrent() > 0); @@ -186,18 +186,18 @@ public class BlockDoor extends Block { // CraftBukkit end } } else { - if (world.getTypeId(i, j - 1, k) != this.id) { + if (world.getType(i, j - 1, k) != this) { world.setAir(i, j, k); } - else if (l > 0 && l != this.id) { // CraftBukkit - this.doPhysics(world, i, j - 1, k, l); + if (block != this) { + this.doPhysics(world, i, j - 1, k, block); } } } - public int getDropType(int i, Random random, int j) { - return (i & 8) != 0 ? 0 : (this.material == Material.ORE ? Item.IRON_DOOR.id : Item.WOOD_DOOR.id); + public Item getDropType(int i, Random random, int j) { + return (i & 8) != 0 ? null : (this.material == Material.ORE ? Items.IRON_DOOR : Items.WOOD_DOOR); } public MovingObjectPosition a(World world, int i, int j, int k, Vec3D vec3d, Vec3D vec3d1) { @@ -206,14 +206,14 @@ public class BlockDoor extends Block { } public boolean canPlace(World world, int i, int j, int k) { - return j >= 255 ? false : world.w(i, j - 1, k) && super.canPlace(world, i, j, k) && super.canPlace(world, i, j + 1, k); + return j >= 255 ? false : World.a((IBlockAccess) world, i, j - 1, k) && super.canPlace(world, i, j, k) && super.canPlace(world, i, j + 1, k); } public int h() { return 1; } - public int c_(IBlockAccess iblockaccess, int i, int j, int k) { + public int g(IBlockAccess iblockaccess, int i, int j, int k) { int l = iblockaccess.getData(i, j, k); boolean flag = (l & 8) != 0; int i1; @@ -233,7 +233,7 @@ public class BlockDoor extends Block { } public void a(World world, int i, int j, int k, int l, EntityHuman entityhuman) { - if (entityhuman.abilities.canInstantlyBuild && (l & 8) != 0 && world.getTypeId(i, j - 1, k) == this.id) { + if (entityhuman.abilities.canInstantlyBuild && (l & 8) != 0 && world.getType(i, j - 1, k) == this) { world.setAir(i, j - 1, k); } } |