mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 19:59:42 +00:00
Fixed some inverted logic causing tress to not gen correctly.
This commit is contained in:
1 parent
2d3cd792c9
commit
fc5132b583
12 files changed
+22
-22
No files matched your search
@@ -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);
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user