From 1f2c32669e707efaa36500ae242bedac0256f085 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 3 Oct 2014 15:28:56 -0700 Subject: [PATCH] Fix #265, Fix #264. Stop modest hive spawning in nether, stop high cpu --- api | 2 +- src/main/java/forestry/apiculture/worldgen/HiveEnd.java | 3 ++- src/main/java/forestry/apiculture/worldgen/HiveForest.java | 4 +++- src/main/java/forestry/apiculture/worldgen/HiveJungle.java | 4 +++- src/main/java/forestry/apiculture/worldgen/HiveMeadows.java | 4 +++- src/main/java/forestry/apiculture/worldgen/HiveParched.java | 4 +++- src/main/java/forestry/apiculture/worldgen/HiveSnow.java | 3 ++- src/main/java/forestry/apiculture/worldgen/HiveSwamp.java | 4 +++- 8 files changed, 20 insertions(+), 8 deletions(-) diff --git a/api b/api index d71affa96..104dcacc4 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit d71affa969ffeb6cb9b2ceab41be5bb611d7f62e +Subproject commit 104dcacc4e6be5dc1508e36376d4515618d0af26 diff --git a/src/main/java/forestry/apiculture/worldgen/HiveEnd.java b/src/main/java/forestry/apiculture/worldgen/HiveEnd.java index 92af0a3e8..c93cb5538 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveEnd.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveEnd.java @@ -25,6 +25,7 @@ public class HiveEnd extends HiveGround { @Override public boolean isGoodClimate(BiomeGenBase biome, EnumTemperature temperature, EnumHumidity humidity) { - return biome.biomeID == BiomeGenBase.sky.biomeID; + return super.isGoodClimate(biome, temperature, humidity) && + biome.biomeID == BiomeGenBase.sky.biomeID; } } diff --git a/src/main/java/forestry/apiculture/worldgen/HiveForest.java b/src/main/java/forestry/apiculture/worldgen/HiveForest.java index 53347742b..c88e7ff99 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveForest.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveForest.java @@ -24,6 +24,8 @@ public class HiveForest extends HiveTree { @Override public boolean isGoodClimate(BiomeGenBase biome, EnumTemperature temperature, EnumHumidity humidity) { - return temperature == EnumTemperature.NORMAL && humidity == EnumHumidity.NORMAL; + return super.isGoodClimate(biome, temperature, humidity) && + temperature == EnumTemperature.NORMAL && + humidity == EnumHumidity.NORMAL; } } diff --git a/src/main/java/forestry/apiculture/worldgen/HiveJungle.java b/src/main/java/forestry/apiculture/worldgen/HiveJungle.java index 06bcc02f9..dc0d14bea 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveJungle.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveJungle.java @@ -24,6 +24,8 @@ public class HiveJungle extends HiveTree { @Override public boolean isGoodClimate(BiomeGenBase biome, EnumTemperature temperature, EnumHumidity humidity) { - return temperature == EnumTemperature.WARM && humidity == EnumHumidity.DAMP; + return super.isGoodClimate(biome, temperature, humidity) && + temperature == EnumTemperature.WARM && + humidity == EnumHumidity.DAMP; } } diff --git a/src/main/java/forestry/apiculture/worldgen/HiveMeadows.java b/src/main/java/forestry/apiculture/worldgen/HiveMeadows.java index 4bb8da9e2..a5ef3831b 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveMeadows.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveMeadows.java @@ -25,6 +25,8 @@ public class HiveMeadows extends HiveGround { @Override public boolean isGoodClimate(BiomeGenBase biome, EnumTemperature temperature, EnumHumidity humidity) { - return temperature == EnumTemperature.NORMAL && humidity == EnumHumidity.NORMAL; + return super.isGoodClimate(biome, temperature, humidity) && + temperature == EnumTemperature.NORMAL && + humidity == EnumHumidity.NORMAL; } } diff --git a/src/main/java/forestry/apiculture/worldgen/HiveParched.java b/src/main/java/forestry/apiculture/worldgen/HiveParched.java index 0f4ebaa4e..11fb98b89 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveParched.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveParched.java @@ -25,6 +25,8 @@ public class HiveParched extends HiveGround { @Override public boolean isGoodClimate(BiomeGenBase biome, EnumTemperature temperature, EnumHumidity humidity) { - return temperature == EnumTemperature.HOT && humidity == EnumHumidity.ARID; + return super.isGoodClimate(biome, temperature, humidity) && + temperature == EnumTemperature.HOT && + humidity == EnumHumidity.ARID; } } diff --git a/src/main/java/forestry/apiculture/worldgen/HiveSnow.java b/src/main/java/forestry/apiculture/worldgen/HiveSnow.java index 45a04f8a2..73eaded92 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveSnow.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveSnow.java @@ -26,7 +26,8 @@ public class HiveSnow extends HiveGround { @Override public boolean isGoodClimate(BiomeGenBase biome, EnumTemperature temperature, EnumHumidity humidity) { - return temperature == EnumTemperature.COLD || temperature == EnumTemperature.ICY; + return super.isGoodClimate(biome, temperature, humidity) && + (temperature == EnumTemperature.COLD || temperature == EnumTemperature.ICY); } @Override diff --git a/src/main/java/forestry/apiculture/worldgen/HiveSwamp.java b/src/main/java/forestry/apiculture/worldgen/HiveSwamp.java index e968fd45e..7a23f9328 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveSwamp.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveSwamp.java @@ -25,6 +25,8 @@ public class HiveSwamp extends HiveGround { @Override public boolean isGoodClimate(BiomeGenBase biome, EnumTemperature temperature, EnumHumidity humidity) { - return temperature == EnumTemperature.NORMAL && humidity == EnumHumidity.DAMP; + return super.isGoodClimate(biome, temperature, humidity) && + temperature == EnumTemperature.NORMAL && + humidity == EnumHumidity.DAMP; } }