diff --git a/MODSRC/vazkii/botania/client/core/handler/ClientTickHandler.java b/MODSRC/vazkii/botania/client/core/handler/ClientTickHandler.java index 6c2586908..8fb9fcb43 100644 --- a/MODSRC/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/MODSRC/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -22,6 +22,7 @@ import net.minecraft.tileentity.TileEntity; import vazkii.botania.api.mana.IManaCollector; import vazkii.botania.api.mana.TileSignature; import vazkii.botania.client.core.handler.LightningHandler.LightningBolt; +import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.item.ItemTwigWand; @@ -40,8 +41,10 @@ public class ClientTickHandler { if(event.phase == Phase.END) { LightningBolt.update(); - if(Minecraft.getMinecraft().theWorld == null) + if(Minecraft.getMinecraft().theWorld == null) { + ClientProxy.hasRingReachIncrease = false; ManaNetworkHandler.instance.clear(); + } GuiScreen gui = Minecraft.getMinecraft().currentScreen; if(gui == null || !gui.doesGuiPauseGame()) { diff --git a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java index ab5f02a5a..0da5dcbb5 100644 --- a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java @@ -88,6 +88,8 @@ import cpw.mods.fml.relauncher.ReflectionHelper; public class ClientProxy extends CommonProxy { + public static boolean hasRingReachIncrease = false; + @Override public void init(FMLInitializationEvent event) { super.init(event); @@ -173,7 +175,9 @@ public class ClientProxy extends CommonProxy { mc.playerController = controller; } - ((IExtendedPlayerController) mc.playerController).setReachDistanceExtension(((IExtendedPlayerController) mc.playerController).getReachDistanceExtension() + reach); + if(reach > 0 != hasRingReachIncrease) + ((IExtendedPlayerController) mc.playerController).setReachDistanceExtension(((IExtendedPlayerController) mc.playerController).getReachDistanceExtension() + reach); + hasRingReachIncrease = reach > 0; } }