From bbda5c8ba9d2c98b7e7333a90b7ff12947c15d50 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sat, 17 Sep 2016 22:00:53 +0200 Subject: [PATCH] Fix #1419 Disabled greenhouse in plugins (as they're buggy) and having crash with 'cocoon's --- .../java/forestry/lepidopterology/blocks/BlockCocoon.java | 5 +++++ src/main/java/forestry/lepidopterology/tiles/TileCocoon.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java b/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java index 4850ae587..4452d8a52 100644 --- a/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java +++ b/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java @@ -165,5 +165,10 @@ public class BlockCocoon extends Block implements ITileEntityProvider, IStateMap public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, World worldIn, BlockPos pos) { return BOUNDING_BOX; } + + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + return BOUNDING_BOX; + } } diff --git a/src/main/java/forestry/lepidopterology/tiles/TileCocoon.java b/src/main/java/forestry/lepidopterology/tiles/TileCocoon.java index 062ff51a2..fb2d92945 100644 --- a/src/main/java/forestry/lepidopterology/tiles/TileCocoon.java +++ b/src/main/java/forestry/lepidopterology/tiles/TileCocoon.java @@ -211,7 +211,7 @@ public class TileCocoon extends TileEntity implements IStreamable, IOwnedTile, I } public ButterflyHatch getButterflyHatch(World world, BlockPos pos) { - if (GreenhouseManager.greenhouseHelper.getGreenhouseController(world, pos) == null) { + if (GreenhouseManager.greenhouseHelper == null || GreenhouseManager.greenhouseHelper.getGreenhouseController(world, pos) == null) { return null; } IGreenhouseController controller = GreenhouseManager.greenhouseHelper.getGreenhouseController(world, pos);