--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 @@ -36,24 +36,24 @@ private boolean canPlaceTorchOn(World world, int i, int j, int k) { - return world.isBlockNormalCube(i, j, k) || world.getBlockId(i, j, k) == Block.fence.blockID; + return world.isBlockSolidOnSide(i, j, k,1) || world.getBlockId(i, j, k) == Block.fence.blockID; } public boolean canPlaceBlockAt(World world, int i, int j, int k) { - if(world.isBlockNormalCube(i - 1, j, k)) + if(world.isBlockSolidOnSide(i - 1, j, k,5)) { return true; } - if(world.isBlockNormalCube(i + 1, j, k)) + if(world.isBlockSolidOnSide(i + 1, j, k,4)) { return true; } - if(world.isBlockNormalCube(i, j, k - 1)) + if(world.isBlockSolidOnSide(i, j, k - 1,3)) { return true; } - if(world.isBlockNormalCube(i, j, k + 1)) + if(world.isBlockSolidOnSide(i, j, k + 1,2)) { return true; } @@ -67,19 +67,19 @@ { i1 = 5; } - if(l == 2 && world.isBlockNormalCube(i, j, k + 1)) + if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2)) { i1 = 4; } - if(l == 3 && world.isBlockNormalCube(i, j, k - 1)) + if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3)) { i1 = 3; } - if(l == 4 && world.isBlockNormalCube(i + 1, j, k)) + if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4)) { i1 = 2; } - if(l == 5 && world.isBlockNormalCube(i - 1, j, k)) + if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5)) { i1 = 1; } @@ -97,19 +97,19 @@ public void onBlockAdded(World world, int i, int j, int k) { - if(world.isBlockNormalCube(i - 1, j, k)) + if(world.isBlockSolidOnSide(i - 1, j, k,5)) { world.setBlockMetadataWithNotify(i, j, k, 1); } else - if(world.isBlockNormalCube(i + 1, j, k)) + if(world.isBlockSolidOnSide(i + 1, j, k,4)) { world.setBlockMetadataWithNotify(i, j, k, 2); } else - if(world.isBlockNormalCube(i, j, k - 1)) + if(world.isBlockSolidOnSide(i, j, k - 1,3)) { world.setBlockMetadataWithNotify(i, j, k, 3); } else - if(world.isBlockNormalCube(i, j, k + 1)) + if(world.isBlockSolidOnSide(i, j, k + 1,2)) { world.setBlockMetadataWithNotify(i, j, k, 4); } else @@ -126,19 +126,19 @@ { int i1 = world.getBlockMetadata(i, j, k); boolean flag = false; - if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1) + if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1) { flag = true; } - if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2) + if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2) { flag = true; } - if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3) + if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3) { flag = true; } - if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4) + if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4) { flag = true; }