Fix #265, Fix #264. Stop modest hive spawning in nether, stop high cpu

This commit is contained in:
mezz committed 2014-10-03 16:01:46 -07:00
1 parent 4b2336bae2
commit 1f2c32669e
8 files changed
+20 -8

No files matched your search

@@ -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;
}
}
@@ -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;
}
}
@@ -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;
}
}
@@ -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;
}
}
@@ -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;
}
}
@@ -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
@@ -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;
}
}