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/BlockDragonEgg.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/BlockDragonEgg.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockDragonEgg.java | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/main/java/net/minecraft/server/BlockDragonEgg.java b/src/main/java/net/minecraft/server/BlockDragonEgg.java index 2c461253..a27a6c07 100644 --- a/src/main/java/net/minecraft/server/BlockDragonEgg.java +++ b/src/main/java/net/minecraft/server/BlockDragonEgg.java @@ -6,56 +6,56 @@ import org.bukkit.event.block.BlockFromToEvent; // CraftBukkit public class BlockDragonEgg extends Block { - public BlockDragonEgg(int i, int j) { - super(i, j, Material.DRAGON_EGG); + public BlockDragonEgg(int i) { + super(i, Material.DRAGON_EGG); this.a(0.0625F, 0.0F, 0.0625F, 0.9375F, 1.0F, 0.9375F); } public void onPlace(World world, int i, int j, int k) { - world.a(i, j, k, this.id, this.r_()); + world.a(i, j, k, this.id, this.a(world)); } public void doPhysics(World world, int i, int j, int k, int l) { - world.a(i, j, k, this.id, this.r_()); + world.a(i, j, k, this.id, this.a(world)); } - public void b(World world, int i, int j, int k, Random random) { - this.l(world, i, j, k); + public void a(World world, int i, int j, int k, Random random) { + this.k(world, i, j, k); } - private void l(World world, int i, int j, int k) { + private void k(World world, int i, int j, int k) { if (BlockSand.canFall(world, i, j - 1, k) && j >= 0) { byte b0 = 32; - if (!BlockSand.instaFall && world.d(i - b0, j - b0, k - b0, i + b0, j + b0, k + b0)) { + if (!BlockSand.instaFall && world.e(i - b0, j - b0, k - b0, i + b0, j + b0, k + b0)) { // CraftBukkit - added data EntityFallingBlock entityfallingblock = new EntityFallingBlock(world, (double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), this.id, world.getData(i, j, k)); world.addEntity(entityfallingblock); } else { - world.setTypeId(i, j, k, 0); + world.setAir(i, j, k); while (BlockSand.canFall(world, i, j - 1, k) && j > 0) { --j; } if (j > 0) { - world.setTypeId(i, j, k, this.id); + world.setTypeIdAndData(i, j, k, this.id, 0, 2); } } } } public boolean interact(World world, int i, int j, int k, EntityHuman entityhuman, int l, float f, float f1, float f2) { - this.n(world, i, j, k); + this.m(world, i, j, k); return true; } public void attack(World world, int i, int j, int k, EntityHuman entityhuman) { - this.n(world, i, j, k); + this.m(world, i, j, k); } - private void n(World world, int i, int j, int k) { + private void m(World world, int i, int j, int k) { if (world.getTypeId(i, j, k) == this.id) { for (int l = 0; l < 1000; ++l) { int i1 = i + world.random.nextInt(16) - world.random.nextInt(16); @@ -79,8 +79,8 @@ public class BlockDragonEgg extends Block { // CraftBukkit end if (!world.isStatic) { - world.setTypeIdAndData(i1, j1, k1, this.id, world.getData(i, j, k)); - world.setTypeId(i, j, k, 0); + world.setTypeIdAndData(i1, j1, k1, this.id, world.getData(i, j, k), 2); + world.setAir(i, j, k); } else { short short1 = 128; @@ -103,7 +103,7 @@ public class BlockDragonEgg extends Block { } } - public int r_() { + public int a(World world) { return 5; } |