From 1a8f1751d90f8dc42ce1d294ef7d244d26a3f78d Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 31 Jul 2016 17:10:59 -0700 Subject: [PATCH] Fix #1366 Alveary in the Nether does not have Hellish temperature --- gradle.properties | 2 +- .../multiblock/AlvearyController.java | 24 ++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/gradle.properties b/gradle.properties index fd37412b5..cd60073d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,4 +8,4 @@ ic2_version=2.6.5-ex110 version_major=5 version_minor=2 -version_patch=3 +version_patch=4 diff --git a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java index cbcd6aa4a..7a5024536 100644 --- a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java @@ -15,21 +15,13 @@ import java.io.IOException; import java.util.HashSet; import java.util.Set; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; - import com.mojang.authlib.GameProfile; - import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IBeeHousingInventory; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IBeekeepingLogic; +import forestry.api.core.BiomeHelper; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.ForestryAPI; @@ -48,6 +40,13 @@ import forestry.core.network.DataOutputStreamForestry; import forestry.core.proxy.Proxies; import forestry.core.utils.BlockUtil; import forestry.core.utils.Translator; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; public class AlvearyController extends RectangularMultiblockControllerBase implements IAlvearyControllerInternal, IClimateControlled { @@ -355,8 +354,11 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple @Override public EnumTemperature getTemperature() { IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(this); - if (beeModifier.isHellish() && tempChange >= 0) { - return EnumTemperature.HELLISH; + Biome biome = getBiome(); + if (beeModifier.isHellish() || BiomeHelper.isBiomeHellish(biome)) { + if (tempChange >= 0) { + return EnumTemperature.HELLISH; + } } return EnumTemperature.getFromValue(getExactTemperature());