diff --git a/rejects/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.java.patch.rej b/rejects/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.java.patch.rej deleted file mode 100644 index 8e41645a2..000000000 --- a/rejects/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.java.patch.rej +++ /dev/null @@ -1,16 +0,0 @@ -++++ REJECTED PATCH 1 - { - Block block; - -- while (((block = worldIn.getBlockState(position).getBlock()).getMaterial() == Material.air || block.getMaterial() == Material.leaves) && position.getY() > 0) -+ do - { -+ block = worldIn.getBlockState(position).getBlock(); -+ if (!block.isAir(worldIn, position) && !block.isLeaves(worldIn, position)) break; - position = position.down(); -- } -+ } while (position.getY() > 0); - - for (int i = 0; i < 128; ++i) - { -++++ END PATCH diff --git a/rejects/minecraft/net/minecraft/world/gen/feature/WorldGenTrees.java.patch.rej b/rejects/minecraft/net/minecraft/world/gen/feature/WorldGenTrees.java.patch.rej deleted file mode 100644 index 4476c426a..000000000 --- a/rejects/minecraft/net/minecraft/world/gen/feature/WorldGenTrees.java.patch.rej +++ /dev/null @@ -1,88 +0,0 @@ -++++ REJECTED PATCH 2 - } - else - { -- Block block1 = worldIn.getBlockState(position.down()).getBlock(); -+ BlockPos down = position.down(); -+ Block block1 = worldIn.getBlockState(down).getBlock(); -+ boolean isSoil = block1.canSustainPlant(worldIn, down, net.minecraft.util.EnumFacing.UP, (net.minecraft.block.BlockSapling)Blocks.sapling); - -- if ((block1 == Blocks.grass || block1 == Blocks.dirt || block1 == Blocks.farmland) && position.getY() < 256 - i - 1) -+ if (isSoil && position.getY() < 256 - i - 1) - { -- this.func_175921_a(worldIn, position.down()); -+ block1.onPlantGrow(worldIn, down, position); - int k2 = 3; - int l2 = 0; - -++++ END PATCH -++++ REJECTED PATCH 3 - BlockPos blockpos = new BlockPos(k1, i3, i2); - Block block = worldIn.getBlockState(blockpos).getBlock(); - -- if (block.getMaterial() == Material.air || block.getMaterial() == Material.leaves || block.getMaterial() == Material.vine) -+ if (block.isAir(worldIn, blockpos) || block.isLeaves(worldIn, blockpos) || block.getMaterial() == Material.vine) - { - this.setBlockAndNotifyAdequately(worldIn, blockpos, this.metaLeaves); - } -++++ END PATCH -++++ REJECTED PATCH 4 - - for (int j3 = 0; j3 < i; ++j3) - { -- Block block2 = worldIn.getBlockState(position.up(j3)).getBlock(); -+ BlockPos upN = position.up(j3); -+ Block block2 = worldIn.getBlockState(upN).getBlock(); - -- if (block2.getMaterial() == Material.air || block2.getMaterial() == Material.leaves || block2.getMaterial() == Material.vine) -+ if (block2.isAir(worldIn, upN) || block2.isLeaves(worldIn, upN) || block2.getMaterial() == Material.vine) - { - this.setBlockAndNotifyAdequately(worldIn, position.up(j3), this.metaWood); - -++++ END PATCH -++++ REJECTED PATCH 5 - { - blockpos$mutableblockpos1.set(l4, k3, i5); - -- if (worldIn.getBlockState(blockpos$mutableblockpos1).getBlock().getMaterial() == Material.leaves) -+ if (worldIn.getBlockState(blockpos$mutableblockpos1).getBlock().isLeaves(worldIn,blockpos$mutableblockpos1)) - { - BlockPos blockpos2 = blockpos$mutableblockpos1.west(); - BlockPos blockpos3 = blockpos$mutableblockpos1.east(); - BlockPos blockpos4 = blockpos$mutableblockpos1.north(); - BlockPos blockpos1 = blockpos$mutableblockpos1.south(); - -- if (rand.nextInt(4) == 0 && worldIn.getBlockState(blockpos2).getBlock().getMaterial() == Material.air) -+ if (rand.nextInt(4) == 0 && worldIn.getBlockState(blockpos2).getBlock().isAir(worldIn,blockpos2)) - { - this.func_181650_b(worldIn, blockpos2, BlockVine.EAST); - } - -- if (rand.nextInt(4) == 0 && worldIn.getBlockState(blockpos3).getBlock().getMaterial() == Material.air) -+ if (rand.nextInt(4) == 0 && worldIn.getBlockState(blockpos3).getBlock().isAir(worldIn,blockpos3)) - { - this.func_181650_b(worldIn, blockpos3, BlockVine.WEST); - } - -- if (rand.nextInt(4) == 0 && worldIn.getBlockState(blockpos4).getBlock().getMaterial() == Material.air) -+ if (rand.nextInt(4) == 0 && worldIn.getBlockState(blockpos4).getBlock().isAir(worldIn,blockpos4)) - { - this.func_181650_b(worldIn, blockpos4, BlockVine.SOUTH); - } - -- if (rand.nextInt(4) == 0 && worldIn.getBlockState(blockpos1).getBlock().getMaterial() == Material.air) -+ if (rand.nextInt(4) == 0 && worldIn.getBlockState(blockpos1).getBlock().isAir(worldIn,blockpos1)) - { - this.func_181650_b(worldIn, blockpos1, BlockVine.NORTH); - } -++++ END PATCH -++++ REJECTED PATCH 6 - this.func_181651_a(p_181650_1_, p_181650_2_, p_181650_3_); - int i = 4; - -- for (p_181650_2_ = p_181650_2_.down(); p_181650_1_.getBlockState(p_181650_2_).getBlock().getMaterial() == Material.air && i > 0; --i) -+ for (p_181650_2_ = p_181650_2_.down(); p_181650_1_.getBlockState(p_181650_2_).getBlock().isAir(p_181650_1_,p_181650_2_) && i > 0; --i) - { - this.func_181651_a(p_181650_1_, p_181650_2_, p_181650_3_); - p_181650_2_ = p_181650_2_.down(); -++++ END PATCH