From b5b4ff2de6c4dbe811e6c1d03d6d0b6179deb679 Mon Sep 17 00:00:00 2001 From: temp1011 <34900092+temp1011@users.noreply.github.com> Date: Fri, 5 Jan 2018 16:13:40 +0000 Subject: [PATCH] Fix hive flammability Hive placed in the overworld burned whereas hive placed in nether did not in my tests. Hopefully this works better. --- .../apiculture/blocks/BlockBeeHives.java | 29 ++++++++++++++++++- .../apiculture/worldgen/HiveDescription.java | 8 +---- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/main/java/forestry/apiculture/blocks/BlockBeeHives.java b/src/main/java/forestry/apiculture/blocks/BlockBeeHives.java index c6180388d..0a6e4be90 100755 --- a/src/main/java/forestry/apiculture/blocks/BlockBeeHives.java +++ b/src/main/java/forestry/apiculture/blocks/BlockBeeHives.java @@ -25,6 +25,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -39,6 +40,7 @@ import forestry.api.apiculture.IBee; import forestry.api.apiculture.IHiveDrop; import forestry.api.apiculture.IHiveTile; import forestry.api.apiculture.hives.IHiveRegistry.HiveType; +import forestry.api.core.BiomeHelper; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.Tabs; @@ -197,5 +199,30 @@ public class BlockBeeHives extends BlockContainer implements IItemModelRegister, public String getNameFromMeta(int meta) { return HiveType.VALUES[meta].getName(); } - + + @Override + public int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing face) + { + if(!BiomeHelper.isBiomeHellish(world.getBiome(pos))) + { + return 5; + } + return 0; + } + + @Override + public boolean isFlammable(IBlockAccess world, BlockPos pos, EnumFacing face) + { + return !BiomeHelper.isBiomeHellish(world.getBiome(pos)); + } + + @Override + public int getFireSpreadSpeed(IBlockAccess world, BlockPos pos, EnumFacing face) + { + if(!BiomeHelper.isBiomeHellish(world.getBiome(pos))) + { + return 5; + } + return 0; + } } diff --git a/src/main/java/forestry/apiculture/worldgen/HiveDescription.java b/src/main/java/forestry/apiculture/worldgen/HiveDescription.java index a1143f4a2..4c6b79d17 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveDescription.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveDescription.java @@ -145,13 +145,7 @@ public enum HiveDescription implements IHiveDescription { } @Override - public void postGen(World world, Random rand, BlockPos pos) { - if(isGoodBiome(world.getBiome(pos))) - { - Blocks.FIRE.setFireInfo(world.getBlockState(pos).getBlock(), 5, 5); - } - - } + public void postGen(World world, Random rand, BlockPos pos) {} protected static void postGenFlowers(World world, Random rand, BlockPos hivePos, List flowerStates) { int plantedCount = 0;