From 08e16288e2d7b13dab8ce6f6569e919f5183367d Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 23 Oct 2016 16:23:53 +0100 Subject: [PATCH] Fixed the teru teru bozu not resetting the rain time. --- .../vazkii/botania/common/block/BlockTeruTeruBozu.java | 5 ++++- .../botania/common/block/tile/TileTeruTeruBozu.java | 9 ++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 284865ee7..695ee8609 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -86,6 +86,7 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { private boolean removeRain(World world) { if(world.isRaining()) { world.getWorldInfo().setRaining(false); + TileTeruTeruBozu.resetRainTime(world); return true; } return false; @@ -93,8 +94,10 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { private boolean startRain(World world) { if(!world.isRaining()) { - if(world.rand.nextInt(10) == 0) + if(world.rand.nextInt(10) == 0) { world.getWorldInfo().setRaining(true); + TileTeruTeruBozu.resetRainTime(world); + } return true; } return false; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java index 9af15778c..e4f0bfc2d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.block.tile; +import net.minecraft.world.World; + public class TileTeruTeruBozu extends TileMod { public boolean wasRaining = false; @@ -20,12 +22,17 @@ public class TileTeruTeruBozu extends TileMod { return; boolean isRaining = worldObj.isRaining(); - if(isRaining && worldObj.rand.nextInt(9600) == 0) + if(isRaining && worldObj.rand.nextInt(9600) == 0) { worldObj.getWorldInfo().setRaining(false); + resetRainTime(worldObj); + } if(wasRaining != isRaining) worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); wasRaining = isRaining; } + public static void resetRainTime(World w){ + w.getWorldInfo().setRainTime(w.rand.nextInt(w.getWorldInfo().isRaining() ? 12000 : 168000) + 12000); + } }