From a014ef6d14271908f5ba52d2633d8f4a194b05a7 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Fri, 12 Aug 2016 13:48:19 +0200 Subject: [PATCH] Fix #1381 Greenhouse climate switches between normal and very high levels and fix a cocoon bug --- .../forestry/greenhouse/tiles/TileGreenhouseClimatiser.java | 4 ++-- .../forestry/greenhouse/tiles/TileGreenhouseSprinkler.java | 2 +- .../java/forestry/lepidopterology/items/ItemButterflyGE.java | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseClimatiser.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseClimatiser.java index 8e405884c..9b689bc33 100644 --- a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseClimatiser.java +++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseClimatiser.java @@ -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))); } } } diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseSprinkler.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseSprinkler.java index 8e36af8bc..8625840e5 100644 --- a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseSprinkler.java +++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseSprinkler.java @@ -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)))); } } } diff --git a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java index a22903085..dadbb9d73 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java +++ b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java @@ -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);