From 56a907dbec509d12a8a2b298d1e82fa774766dc5 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sun, 19 Feb 2017 21:59:28 +0100 Subject: [PATCH] Fix Cocoon --- .../genetics/ButterflyRoot.java | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java index 1af0bda24..3d05d3287 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java @@ -188,7 +188,7 @@ public class ButterflyRoot extends SpeciesRoot implements IButterflyRoot { BlockRegistryLepidopterology blocks = PluginLepidopterology.getBlocks(); - BlockPos pos = getNextPos(world, nursery.getCoordinates()); + BlockPos pos = getNextValidPos(world, nursery.getCoordinates()); IBlockState state = blocks.cocoon.getDefaultState(); boolean placed = world.setBlockState(pos, state); if (!placed) { @@ -215,12 +215,25 @@ public class ButterflyRoot extends SpeciesRoot implements IButterflyRoot { return pos; } - private BlockPos getNextPos(World world, BlockPos pos) { - IBlockState blockState; - do { - pos = pos.down(); - blockState = world.getBlockState(pos); - } while (!BlockUtil.canReplace(blockState, world, pos)); + private BlockPos getNextValidPos(World world, BlockPos pos) { + for(int x = -2;x < 2;x++){ + for(int z = -2;z < 2;z++){ + for(int y = 1;y < 7;y++){ + BlockPos coordinate = pos.add(x, -y, z); + TileEntity tile = world.getTileEntity(coordinate); + IBlockState blockState = world.getBlockState(coordinate); + if(tile instanceof IButterflyNursery){ + IButterflyNursery nursery = (IButterflyNursery) tile; + if(nursery.getCaterpillar() != null){ + break; + } + } + if(BlockUtil.canReplace(blockState, world, coordinate)){ + return coordinate; + } + } + } + } return pos; }