diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockSkull.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/BlockSkull.java | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/src/main/java/net/minecraft/server/BlockSkull.java b/src/main/java/net/minecraft/server/BlockSkull.java index de166a1b..933f49ae 100644 --- a/src/main/java/net/minecraft/server/BlockSkull.java +++ b/src/main/java/net/minecraft/server/BlockSkull.java @@ -11,7 +11,6 @@ public class BlockSkull extends BlockContainer { protected BlockSkull(int i) { super(i, Material.ORIENTABLE); - this.textureId = 104; this.a(0.25F, 0.0F, 0.25F, 0.75F, 0.5F, 0.75F); } @@ -53,18 +52,18 @@ public class BlockSkull extends BlockContainer { } } - public AxisAlignedBB e(World world, int i, int j, int k) { + public AxisAlignedBB b(World world, int i, int j, int k) { this.updateShape(world, i, j, k); - return super.e(world, i, j, k); + return super.b(world, i, j, k); } - public void postPlace(World world, int i, int j, int k, EntityLiving entityliving) { + public void postPlace(World world, int i, int j, int k, EntityLiving entityliving, ItemStack itemstack) { int l = MathHelper.floor((double) (entityliving.yaw * 4.0F / 360.0F) + 2.5D) & 3; - world.setData(i, j, k, l); + world.setData(i, j, k, l, 2); } - public TileEntity a(World world) { + public TileEntity b(World world) { return new TileEntitySkull(); } @@ -97,7 +96,7 @@ public class BlockSkull extends BlockContainer { public void a(World world, int i, int j, int k, int l, EntityHuman entityhuman) { if (entityhuman.abilities.canInstantlyBuild) { l |= 8; - world.setData(i, j, k, l); + world.setData(i, j, k, l, 4); } super.a(world, i, j, k, l, entityhuman); @@ -128,7 +127,7 @@ public class BlockSkull extends BlockContainer { } public void a(World world, int i, int j, int k, TileEntitySkull tileentityskull) { - if (tileentityskull.getSkullType() == 1 && j >= 2 && world.difficulty > 0) { + if (tileentityskull.getSkullType() == 1 && j >= 2 && world.difficulty > 0 && !world.isStatic) { int l = Block.SOUL_SAND.id; int i1; @@ -140,9 +139,9 @@ public class BlockSkull extends BlockContainer { // CraftBukkit start - use BlockStateListPopulator BlockStateListPopulator blockList = new BlockStateListPopulator(world.getWorld()); - world.setRawData(i, j, k + i1, 8); - world.setRawData(i, j, k + i1 + 1, 8); - world.setRawData(i, j, k + i1 + 2, 8); + world.setData(i, j, k + i1, 8, 2); + world.setData(i, j, k + i1 + 1, 8, 2); + world.setData(i, j, k + i1 + 2, 8, 2); blockList.setTypeId(i, j, k + i1, 0); blockList.setTypeId(i, j, k + i1 + 1, 0); @@ -155,7 +154,7 @@ public class BlockSkull extends BlockContainer { if (!world.isStatic) { entitywither = new EntityWither(world); entitywither.setPositionRotation((double) i + 0.5D, (double) j - 1.45D, (double) (k + i1) + 1.5D, 90.0F, 0.0F); - entitywither.ax = 90.0F; + entitywither.ay = 90.0F; entitywither.m(); if (world.addEntity(entitywither, SpawnReason.BUILD_WITHER)) { @@ -177,9 +176,9 @@ public class BlockSkull extends BlockContainer { // CraftBukkit start - use BlockStateListPopulator BlockStateListPopulator blockList = new BlockStateListPopulator(world.getWorld()); - world.setRawData(i + i1, j, k, 8); - world.setRawData(i + i1 + 1, j, k, 8); - world.setRawData(i + i1 + 2, j, k, 8); + world.setData(i + i1, j, k, 8, 2); + world.setData(i + i1 + 1, j, k, 8, 2); + world.setData(i + i1 + 2, j, k, 8, 2); blockList.setTypeId(i + i1, j, k, 0); blockList.setTypeId(i + i1 + 1, j, k, 0); |