etc/BiomesOPlenty
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allowed vines to not be instances of BlockVine

Browse source
This commit is contained in:
Adubbz 2016-01-22 23:37:27 +11:00
parent ebf9f31d9d
commit e935710e8e
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/biomesoplenty/common/world/feature/tree/GeneratorBasicTree.java
View file

@ -266,7 +266,7 @@ public class GeneratorBasicTree extends GeneratorTreeBase
private IBlockState getVineStateForSide(EnumFacing side)
{
return this.vine.withProperty(BlockVine.getPropertyFor(side), Boolean.valueOf(true));
return this.vine.getBlock() instanceof BlockVine ? this.vine.withProperty(BlockVine.getPropertyFor(side), Boolean.valueOf(true)) : this.vine;
}
private void extendVines(World world, BlockPos pos, EnumFacing side)

6
src/main/java/biomesoplenty/common/world/feature/tree/GeneratorTreeBase.java
View file

@ -114,11 +114,9 @@ public abstract class GeneratorTreeBase extends BOPGeneratorBase
{
this.vine = null;
}
else if (a.getBlock() instanceof BlockVine)
else
{
this.vine = a;
} else {
throw new IllegalArgumentException("vine must use a BlockVine block");
}
return this.self();
}
@ -165,7 +163,7 @@ public abstract class GeneratorTreeBase extends BOPGeneratorBase
public boolean setVine(World world, Random rand, BlockPos pos, EnumFacing side, int length)
{
if (this.vine == null) {return false;}
IBlockState vineState = this.vine.withProperty(BlockVine.NORTH, Boolean.valueOf(side == EnumFacing.NORTH)).withProperty(BlockVine.EAST, Boolean.valueOf(side == EnumFacing.EAST)).withProperty(BlockVine.SOUTH, Boolean.valueOf(side == EnumFacing.SOUTH)).withProperty(BlockVine.WEST, Boolean.valueOf(side == EnumFacing.WEST));
IBlockState vineState = this.vine.getBlock() instanceof BlockVine ? this.vine.withProperty(BlockVine.NORTH, Boolean.valueOf(side == EnumFacing.NORTH)).withProperty(BlockVine.EAST, Boolean.valueOf(side == EnumFacing.EAST)).withProperty(BlockVine.SOUTH, Boolean.valueOf(side == EnumFacing.SOUTH)).withProperty(BlockVine.WEST, Boolean.valueOf(side == EnumFacing.WEST)) : this.vine;
boolean setOne = false;
while (world.getBlockState(pos).getBlock().isAir(world, pos) && length > 0 && rand.nextInt(12) > 0)
{