From 73bf3a898527757a52d1349472a9d0d0ecf16928 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 17 Aug 2012 16:09:46 -0400 Subject: [PATCH] Fix up ML GUI ticking. Thanks sharose! --- fml/client/net/minecraft/src/BaseMod.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/fml/client/net/minecraft/src/BaseMod.java b/fml/client/net/minecraft/src/BaseMod.java index 923bdecdc6..a8df11bd3d 100644 --- a/fml/client/net/minecraft/src/BaseMod.java +++ b/fml/client/net/minecraft/src/BaseMod.java @@ -27,8 +27,6 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr { // CALLBACK MECHANISMS - private boolean fml_lastWorld = false; - public final boolean doTickInGame(TickType tick, boolean tickEnd, Object... data) { Minecraft mc = FMLClientHandler.instance().getClient(); @@ -43,17 +41,10 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr public final boolean doTickInGUI(TickType tick, boolean tickEnd, Object... data) { Minecraft mc = FMLClientHandler.instance().getClient(); - boolean hasWorld = mc.field_71441_e != null; - if (!hasWorld && !fml_lastWorld) - { - fml_lastWorld = true; - } - else if (!hasWorld && fml_lastWorld) - { - return true; - } - if (tickEnd && ( tick==TickType.RENDER || tick==TickType.CLIENT)) { + boolean hasWorld = mc.field_71441_e != null; + + if (tickEnd && ( tick==TickType.RENDER || ( tick==TickType.CLIENT && hasWorld))) { return onTickInGUI((Float) data[0], mc, mc.field_71462_r); } return true;