From fc5132b583735b1e994ac6bda030381e2c0f5849 Mon Sep 17 00:00:00 2001 From: LexManos Date: Sun, 3 Jun 2012 11:40:12 -0700 Subject: [PATCH] Fixed some inverted logic causing tress to not gen correctly. --- .../net/minecraft/src/WorldGenBigMushroom.java.patch | 4 ++-- .../minecraft/net/minecraft/src/WorldGenForest.java.patch | 6 +++--- .../minecraft/net/minecraft/src/WorldGenShrub.java.patch | 2 +- .../minecraft/net/minecraft/src/WorldGenSwamp.java.patch | 4 ++-- .../minecraft/net/minecraft/src/WorldGenTaiga1.java.patch | 2 +- .../minecraft/net/minecraft/src/WorldGenTrees.java.patch | 4 ++-- .../net/minecraft/src/WorldGenBigMushroom.java.patch | 4 ++-- .../net/minecraft/src/WorldGenForest.java.patch | 6 +++--- .../net/minecraft/src/WorldGenShrub.java.patch | 2 +- .../net/minecraft/src/WorldGenSwamp.java.patch | 4 ++-- .../net/minecraft/src/WorldGenTaiga1.java.patch | 2 +- .../net/minecraft/src/WorldGenTrees.java.patch | 4 ++-- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/WorldGenBigMushroom.java.patch b/forge/patches/minecraft/net/minecraft/src/WorldGenBigMushroom.java.patch index 28c80fc4b..972aefa27 100644 --- a/forge/patches/minecraft/net/minecraft/src/WorldGenBigMushroom.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/WorldGenBigMushroom.java.patch @@ -18,7 +18,7 @@ - if ((var15 != 0 || par4 >= par4 + var7 - 1) && !Block.opaqueCubeLookup[par1World.getBlockId(var13, var11, var14)]) + Block block = Block.blocksList[par1World.getBlockId(var13, var11, var14)]; + -+ if ((var15 != 0 || par4 >= par4 + var7 - 1) && (block != null && block.canBeReplacedByLeaves(par1World, var13, var11, var14))) ++ if ((var15 != 0 || par4 >= par4 + var7 - 1) && (block == null || block.canBeReplacedByLeaves(par1World, var13, var11, var14))) { this.setBlockAndMetadata(par1World, var13, var11, var14, Block.mushroomCapBrown.blockID + var6, var15); } @@ -29,7 +29,7 @@ - if (!Block.opaqueCubeLookup[var12]) + Block block = Block.blocksList[var12]; + -+ if (block != null && block.canBeReplacedByLeaves(par1World, par3, par4 + var11, par5)) ++ if (block == null || block.canBeReplacedByLeaves(par1World, par3, par4 + var11, par5)) { this.setBlockAndMetadata(par1World, par3, par4 + var11, par5, Block.mushroomCapBrown.blockID + var6, 10); } diff --git a/forge/patches/minecraft/net/minecraft/src/WorldGenForest.java.patch b/forge/patches/minecraft/net/minecraft/src/WorldGenForest.java.patch index af4cb6b61..6290e9f65 100644 --- a/forge/patches/minecraft/net/minecraft/src/WorldGenForest.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/WorldGenForest.java.patch @@ -7,7 +7,7 @@ - if (var12 != 0 && var12 != Block.leaves.blockID) + Block block = Block.blocksList[var12]; + -+ if (var12 != 0 && (block != null && block.isLeaves(par1World, var10, var8, var11))) ++ if (var12 != 0 && (block != null && !block.isLeaves(par1World, var10, var8, var11))) { var7 = false; } @@ -19,7 +19,7 @@ + Block block = Block.blocksList[par1World.getBlockId(var12, var16, var14)]; + + if ((Math.abs(var13) != var11 || Math.abs(var15) != var11 || par2Random.nextInt(2) != 0 && var10 != 0) && -+ (block != null && block.canBeReplacedByLeaves(par1World, var12, var16, var14))) ++ (block == null || block.canBeReplacedByLeaves(par1World, var12, var16, var14))) { this.setBlockAndMetadata(par1World, var12, var16, var14, Block.leaves.blockID, 2); } @@ -30,7 +30,7 @@ - if (var10 == 0 || var10 == Block.leaves.blockID) + Block block = Block.blocksList[var10]; + -+ if (var10 == 0 || (block != null && block.isLeaves(par1World, par3, par4 + var16, par5))) ++ if (var10 == 0 || block == null || block.isLeaves(par1World, par3, par4 + var16, par5)) { this.setBlockAndMetadata(par1World, par3, par4 + var16, par5, Block.wood.blockID, 2); } diff --git a/forge/patches/minecraft/net/minecraft/src/WorldGenShrub.java.patch b/forge/patches/minecraft/net/minecraft/src/WorldGenShrub.java.patch index da592d391..9952430f3 100644 --- a/forge/patches/minecraft/net/minecraft/src/WorldGenShrub.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/WorldGenShrub.java.patch @@ -27,7 +27,7 @@ - if ((Math.abs(var12) != var10 || Math.abs(var14) != var10 || par2Random.nextInt(2) != 0) && !Block.opaqueCubeLookup[par1World.getBlockId(var11, var8, var13)]) + block = Block.blocksList[par1World.getBlockId(var11, var8, var13)]; + -+ if ((Math.abs(var12) != var10 || Math.abs(var14) != var10 || par2Random.nextInt(2) != 0) && (block != null && block.canBeReplacedByLeaves(par1World, var11, var8, var13))) ++ if ((Math.abs(var12) != var10 || Math.abs(var14) != var10 || par2Random.nextInt(2) != 0) && (block == null || block.canBeReplacedByLeaves(par1World, var11, var8, var13))) { this.setBlockAndMetadata(par1World, var11, var8, var13, Block.leaves.blockID, this.field_48197_a); } diff --git a/forge/patches/minecraft/net/minecraft/src/WorldGenSwamp.java.patch b/forge/patches/minecraft/net/minecraft/src/WorldGenSwamp.java.patch index 72d85b61f..31c67a302 100644 --- a/forge/patches/minecraft/net/minecraft/src/WorldGenSwamp.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/WorldGenSwamp.java.patch @@ -5,7 +5,7 @@ var12 = par1World.getBlockId(var10, var8, var11); - if (var12 != 0 && var12 != Block.leaves.blockID) -+ if (var12 != 0 && (Block.blocksList[var12] != null && Block.blocksList[var12].isLeaves(par1World, var10, var8, var11))) ++ if (var12 != 0 && (Block.blocksList[var12] != null && !Block.blocksList[var12].isLeaves(par1World, var10, var8, var11))) { if (var12 != Block.waterStill.blockID && var12 != Block.waterMoving.blockID) { @@ -17,7 +17,7 @@ + Block block = Block.blocksList[par1World.getBlockId(var12, var16, var14)]; + + if ((Math.abs(var13) != var11 || Math.abs(var15) != var11 || par2Random.nextInt(2) != 0 && var10 != 0) && -+ (block != null && block.canBeReplacedByLeaves(par1World, var12, var16, var14))) ++ (block == null || block.canBeReplacedByLeaves(par1World, var12, var16, var14))) { this.setBlock(par1World, var12, var16, var14, Block.leaves.blockID); } diff --git a/forge/patches/minecraft/net/minecraft/src/WorldGenTaiga1.java.patch b/forge/patches/minecraft/net/minecraft/src/WorldGenTaiga1.java.patch index be3997d8b..7cd1ad871 100644 --- a/forge/patches/minecraft/net/minecraft/src/WorldGenTaiga1.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/WorldGenTaiga1.java.patch @@ -19,7 +19,7 @@ + Block block = Block.blocksList[par1World.getBlockId(var14, var13, var16)]; + + if ((Math.abs(var15) != var18 || Math.abs(var17) != var18 || var18 <= 0) && -+ (block != null && block.canBeReplacedByLeaves(par1World, var14, var13, var16))) ++ (block == null || block.canBeReplacedByLeaves(par1World, var14, var13, var16))) { this.setBlockAndMetadata(par1World, var14, var13, var16, Block.leaves.blockID, 1); } diff --git a/forge/patches/minecraft/net/minecraft/src/WorldGenTrees.java.patch b/forge/patches/minecraft/net/minecraft/src/WorldGenTrees.java.patch index 69d8d4744..679b07c03 100644 --- a/forge/patches/minecraft/net/minecraft/src/WorldGenTrees.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/WorldGenTrees.java.patch @@ -8,10 +8,10 @@ + Block block = Block.blocksList[var12]; + + if (var12 != 0 && -+ (block == null || !block.isLeaves(par1World, var10, var8, var11)) && ++ !block.isLeaves(par1World, var10, var8, var11) && + var12 != Block.grass.blockID && + var12 != Block.dirt.blockID && -+ (block == null || !block.isWood(par1World, var10, var8, var11))) ++ !block.isWood(par1World, var10, var8, var11)) { var7 = false; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldGenBigMushroom.java.patch b/forge/patches/minecraft_server/net/minecraft/src/WorldGenBigMushroom.java.patch index b0328fe67..a288eed40 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/WorldGenBigMushroom.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/WorldGenBigMushroom.java.patch @@ -18,7 +18,7 @@ - if ((var15 != 0 || par4 >= par4 + var7 - 1) && !Block.opaqueCubeLookup[par1World.getBlockId(var13, var11, var14)]) + Block block = Block.blocksList[par1World.getBlockId(var13, var11, var14)]; + -+ if ((var15 != 0 || par4 >= par4 + var7 - 1) && (block != null && block.canBeReplacedByLeaves(par1World, var13, var11, var14))) ++ if ((var15 != 0 || par4 >= par4 + var7 - 1) && (block == null || block.canBeReplacedByLeaves(par1World, var13, var11, var14))) { this.setBlockAndMetadata(par1World, var13, var11, var14, Block.mushroomCapBrown.blockID + var6, var15); } @@ -29,7 +29,7 @@ - if (!Block.opaqueCubeLookup[var12]) + Block block = Block.blocksList[var12]; + -+ if (block != null && block.canBeReplacedByLeaves(par1World, par3, par4 + var11, par5)) ++ if (block == null || block.canBeReplacedByLeaves(par1World, par3, par4 + var11, par5)) { this.setBlockAndMetadata(par1World, par3, par4 + var11, par5, Block.mushroomCapBrown.blockID + var6, 10); } diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldGenForest.java.patch b/forge/patches/minecraft_server/net/minecraft/src/WorldGenForest.java.patch index 1d68166a5..6524cac51 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/WorldGenForest.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/WorldGenForest.java.patch @@ -7,7 +7,7 @@ - if (var12 != 0 && var12 != Block.leaves.blockID) + Block block = Block.blocksList[var12]; + -+ if (var12 != 0 && (block != null && block.isLeaves(par1World, var10, var8, var11))) ++ if (var12 != 0 && (block != null && !block.isLeaves(par1World, var10, var8, var11))) { var7 = false; } @@ -19,7 +19,7 @@ + Block block = Block.blocksList[par1World.getBlockId(var12, var16, var14)]; + + if ((Math.abs(var13) != var11 || Math.abs(var15) != var11 || par2Random.nextInt(2) != 0 && var10 != 0) && -+ (block != null && block.canBeReplacedByLeaves(par1World, var12, var16, var14))) ++ (block == null || block.canBeReplacedByLeaves(par1World, var12, var16, var14))) { this.setBlockAndMetadata(par1World, var12, var16, var14, Block.leaves.blockID, 2); } @@ -30,7 +30,7 @@ - if (var10 == 0 || var10 == Block.leaves.blockID) + Block block = Block.blocksList[var10]; + -+ if (var10 == 0 || (block != null && block.isLeaves(par1World, par3, par4 + var16, par5))) ++ if (var10 == 0 || block == null || block.isLeaves(par1World, par3, par4 + var16, par5)) { this.setBlockAndMetadata(par1World, par3, par4 + var16, par5, Block.wood.blockID, 2); } diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldGenShrub.java.patch b/forge/patches/minecraft_server/net/minecraft/src/WorldGenShrub.java.patch index 71ab3d1f1..9509a7ae4 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/WorldGenShrub.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/WorldGenShrub.java.patch @@ -27,7 +27,7 @@ - if ((Math.abs(var12) != var10 || Math.abs(var14) != var10 || par2Random.nextInt(2) != 0) && !Block.opaqueCubeLookup[par1World.getBlockId(var11, var8, var13)]) + block = Block.blocksList[par1World.getBlockId(var11, var8, var13)]; + -+ if ((Math.abs(var12) != var10 || Math.abs(var14) != var10 || par2Random.nextInt(2) != 0) && (block != null && block.canBeReplacedByLeaves(par1World, var11, var8, var13))) ++ if ((Math.abs(var12) != var10 || Math.abs(var14) != var10 || par2Random.nextInt(2) != 0) && (block == null || block.canBeReplacedByLeaves(par1World, var11, var8, var13))) { this.setBlockAndMetadata(par1World, var11, var8, var13, Block.leaves.blockID, this.field_48408_a); } diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldGenSwamp.java.patch b/forge/patches/minecraft_server/net/minecraft/src/WorldGenSwamp.java.patch index ffce7b976..433de5bfb 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/WorldGenSwamp.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/WorldGenSwamp.java.patch @@ -5,7 +5,7 @@ var12 = par1World.getBlockId(var10, var8, var11); - if (var12 != 0 && var12 != Block.leaves.blockID) -+ if (var12 != 0 && (Block.blocksList[var12] != null && Block.blocksList[var12].isLeaves(par1World, var10, var8, var11))) ++ if (var12 != 0 && (Block.blocksList[var12] != null && !Block.blocksList[var12].isLeaves(par1World, var10, var8, var11))) { if (var12 != Block.waterStill.blockID && var12 != Block.waterMoving.blockID) { @@ -17,7 +17,7 @@ + Block block = Block.blocksList[par1World.getBlockId(var12, var16, var14)]; + + if ((Math.abs(var13) != var11 || Math.abs(var15) != var11 || par2Random.nextInt(2) != 0 && var10 != 0) && -+ (block != null && block.canBeReplacedByLeaves(par1World, var12, var16, var14))) ++ (block == null || block.canBeReplacedByLeaves(par1World, var12, var16, var14))) { this.setBlock(par1World, var12, var16, var14, Block.leaves.blockID); } diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldGenTaiga1.java.patch b/forge/patches/minecraft_server/net/minecraft/src/WorldGenTaiga1.java.patch index c4d3c598c..26a521840 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/WorldGenTaiga1.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/WorldGenTaiga1.java.patch @@ -19,7 +19,7 @@ + Block block = Block.blocksList[par1World.getBlockId(var14, var13, var16)]; + + if ((Math.abs(var15) != var18 || Math.abs(var17) != var18 || var18 <= 0) && -+ (block != null && block.canBeReplacedByLeaves(par1World, var14, var13, var16))) ++ (block == null || block.canBeReplacedByLeaves(par1World, var14, var13, var16))) { this.setBlockAndMetadata(par1World, var14, var13, var16, Block.leaves.blockID, 1); } diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldGenTrees.java.patch b/forge/patches/minecraft_server/net/minecraft/src/WorldGenTrees.java.patch index 1415e591e..c56173db3 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/WorldGenTrees.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/WorldGenTrees.java.patch @@ -8,10 +8,10 @@ + Block block = Block.blocksList[var12]; + + if (var12 != 0 && -+ (block == null || !block.isLeaves(par1World, var10, var8, var11)) && ++ !block.isLeaves(par1World, var10, var8, var11) && + var12 != Block.grass.blockID && + var12 != Block.dirt.blockID && -+ (block == null || !block.isWood(par1World, var10, var8, var11))) ++ !block.isWood(par1World, var10, var8, var11)) { var7 = false; }