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/BlockIce.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/BlockIce.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockIce.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/net/minecraft/server/BlockIce.java b/src/main/java/net/minecraft/server/BlockIce.java index b7215376..e2259706 100644 --- a/src/main/java/net/minecraft/server/BlockIce.java +++ b/src/main/java/net/minecraft/server/BlockIce.java @@ -4,8 +4,8 @@ import java.util.Random; public class BlockIce extends BlockHalfTransparant { - public BlockIce(int i, int j) { - super(i, j, Material.ICE, false); + public BlockIce(int i) { + super(i, "ice", Material.ICE, false); this.frictionFactor = 0.98F; this.b(true); this.a(CreativeModeTab.b); @@ -14,15 +14,15 @@ public class BlockIce extends BlockHalfTransparant { public void a(World world, EntityHuman entityhuman, int i, int j, int k, int l) { entityhuman.a(StatisticList.C[this.id], 1); entityhuman.j(0.025F); - if (this.s_() && EnchantmentManager.hasSilkTouchEnchantment(entityhuman)) { - ItemStack itemstack = this.f_(l); + if (this.r_() && EnchantmentManager.hasSilkTouchEnchantment(entityhuman)) { + ItemStack itemstack = this.c_(l); if (itemstack != null) { this.b(world, i, j, k, itemstack); } } else { if (world.worldProvider.e) { - world.setTypeId(i, j, k, 0); + world.setAir(i, j, k); return; } @@ -32,7 +32,7 @@ public class BlockIce extends BlockHalfTransparant { Material material = world.getMaterial(i, j - 1, k); if (material.isSolid() || material.isLiquid()) { - world.setTypeId(i, j, k, Block.WATER.id); + world.setTypeIdUpdate(i, j, k, Block.WATER.id); } } } @@ -41,7 +41,7 @@ public class BlockIce extends BlockHalfTransparant { return 0; } - public void b(World world, int i, int j, int k, Random random) { + public void a(World world, int i, int j, int k, Random random) { if (world.b(EnumSkyBlock.BLOCK, i, j, k) > 11 - Block.lightBlock[this.id]) { // CraftBukkit start if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(world.getWorld().getBlockAt(i, j, k), Block.STATIONARY_WATER.id).isCancelled()) { @@ -50,16 +50,16 @@ public class BlockIce extends BlockHalfTransparant { // CraftBukkit end if (world.worldProvider.e) { - world.setTypeId(i, j, k, 0); + world.setAir(i, j, k); return; } this.c(world, i, j, k, world.getData(i, j, k), 0); - world.setTypeId(i, j, k, Block.STATIONARY_WATER.id); + world.setTypeIdUpdate(i, j, k, Block.STATIONARY_WATER.id); } } - public int q_() { + public int h() { return 0; } } |