From 9419dc82de511b8912db753544d9b279cf85f60d Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 2 Oct 2016 15:17:32 -0700 Subject: [PATCH] Fix #1442 Let BeeHousings detect biome changes --- src/main/java/forestry/apiculture/genetics/Bee.java | 2 +- .../forestry/apiculture/multiblock/AlvearyController.java | 8 ++------ .../forestry/apiculture/tiles/TileBeeHousingBase.java | 6 +----- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index f463ab338..749f0f91f 100644 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -283,7 +283,7 @@ public class Bee extends IndividualLiving implements IBee { } // / Check for the sky, except if in hell - if (biome != null && !BiomeHelper.isBiomeHellish(biome)) { + if (!world.provider.hasNoSky) { if (!housing.canBlockSeeTheSky() && !canWorkUnderground(beeModifier)) { errorStates.add(EnumErrorCode.NO_SKY); } diff --git a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java index d1a1b85be..940793a4d 100644 --- a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java @@ -54,7 +54,6 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple private final InventoryBeeHousing inventory; private final IBeekeepingLogic beekeepingLogic; - private BiomeGenBase cachedBiome; private float tempChange = 0.0f; private float humidChange = 0.0f; @@ -387,11 +386,8 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple @Override public BiomeGenBase getBiome() { - if (cachedBiome == null) { - ChunkCoordinates coords = getReferenceCoord(); - cachedBiome = worldObj.getBiomeGenForCoords(coords.posX, coords.posZ); - } - return cachedBiome; + ChunkCoordinates coords = getReferenceCoord(); + return worldObj.getBiomeGenForCoords(coords.posX, coords.posZ); } @Override diff --git a/src/main/java/forestry/apiculture/tiles/TileBeeHousingBase.java b/src/main/java/forestry/apiculture/tiles/TileBeeHousingBase.java index ade271d7d..b92d7833b 100644 --- a/src/main/java/forestry/apiculture/tiles/TileBeeHousingBase.java +++ b/src/main/java/forestry/apiculture/tiles/TileBeeHousingBase.java @@ -35,7 +35,6 @@ import forestry.core.tiles.TileBase; public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing, IClimatised, IGuiBeeHousingInventory, IStreamableGui { private final IBeekeepingLogic beeLogic; - private BiomeGenBase cachedBiome; // CLIENT private int breedingProgressPercent = 0; @@ -142,10 +141,7 @@ public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing // / IBEEHOUSING @Override public BiomeGenBase getBiome() { - if (cachedBiome == null) { - cachedBiome = worldObj.getBiomeGenForCoordsBody(xCoord, zCoord); - } - return cachedBiome; + return worldObj.getBiomeGenForCoordsBody(xCoord, zCoord); } @Override