Fix #1381 Greenhouse climate switches between normal and very high levels and fix a cocoon bug

This commit is contained in:
Nedelosk committed 2016-08-12 13:48:19 +02:00
1 parent 34fa218c38
commit a014ef6d14
3 files changed
+4 -3

No files matched your search

@@ -141,9 +141,9 @@ public class TileGreenhouseClimatiser extends TileGreenhouse implements IActivat
int maxDistance = definition.getClimitiseRange();
if(distance <= maxDistance){
if (definition.getType() == ClimitiserType.TEMPERATURE) {
position.addTemperature((definition.isPositiv() ? +1 : -1) * (float) (definition.getChange() / distance));
position.addTemperature((definition.isPositiv() ? +1 : -1) * ((distance == 0) ? definition.getChange() : (float) (definition.getChange() / distance)));
}else{
position.addHumidity((definition.isPositiv() ? +1 : -1) * (float) (definition.getChange() / distance));
position.addHumidity((definition.isPositiv() ? +1 : -1) * ((distance == 0) ? definition.getChange() : (float) (definition.getChange() / distance)));
}
}
}
@@ -77,7 +77,7 @@ public class TileGreenhouseSprinkler extends TileGreenhouseClimatiser {
double distance = pos.distanceSq(pos);
int maxDistance = definition.getClimitiseRange();
if(distance <= maxDistance){
position.setHumidity(position.getHumidity() + (float) (definition.getChange() / distance));
position.setHumidity((float) (position.getHumidity() + ((distance == 0) ? definition.getChange() : (definition.getChange() / distance))));
}
}
}
@@ -253,6 +253,7 @@ public class ItemButterflyGE extends ItemGE implements ISpriteRegister, IColored
if (!playerIn.capabilities.isCreativeMode) {
stack.stackSize--;
}
nursery.setCaterpillar(null);
return EnumActionResult.SUCCESS;
}else{
nursery.setCaterpillar(null);