From a4ce90a9186194a64a9846ff77aa41a7cf0dcca0 Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 3 Jul 2012 23:03:51 -0400 Subject: [PATCH] FFS let this fix that bloody ticking mess that is ML compatibility. --- common/cpw/mods/fml/common/modloader/BaseModTicker.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/cpw/mods/fml/common/modloader/BaseModTicker.java b/common/cpw/mods/fml/common/modloader/BaseModTicker.java index 99fee83e35..866b139316 100644 --- a/common/cpw/mods/fml/common/modloader/BaseModTicker.java +++ b/common/cpw/mods/fml/common/modloader/BaseModTicker.java @@ -60,7 +60,7 @@ public class BaseModTicker implements ITickHandler private void tickBaseMod(EnumSet types, boolean end, Object... tickData) { - if (FMLCommonHandler.instance().getSide().isClient() && ( ticks.contains(TickType.GAME) || ticks.contains(TickType.WORLDLOAD))) + if (FMLCommonHandler.instance().getSide().isClient() && ( ticks.contains(TickType.GAME) || ticks.contains(TickType.WORLDLOAD)) || ticks.contains(TickType.RENDER)) { EnumSet cTypes=EnumSet.copyOf(types); if ( ( end && types.contains(TickType.GAME)) || types.contains(TickType.WORLDLOAD)) @@ -74,7 +74,7 @@ public class BaseModTicker implements ITickHandler { clockTickTrigger = false; cTypes.remove(TickType.RENDER); - if (ticks.contains(TickType.GAME)) cTypes.add(TickType.GAME); + cTypes.add(TickType.GAME); } sendTick(cTypes, end, tickData); @@ -97,11 +97,11 @@ public class BaseModTicker implements ITickHandler boolean keepTicking=true; if (sendGuiTicks) { - mod.doTickInGUI(type, end, FMLCommonHandler.instance().getMinecraftInstance(), tickData); + keepTicking = mod.doTickInGUI(type, end, FMLCommonHandler.instance().getMinecraftInstance(), tickData); } else { - mod.doTickInGame(type, end, FMLCommonHandler.instance().getMinecraftInstance(), tickData); + keepTicking = mod.doTickInGame(type, end, FMLCommonHandler.instance().getMinecraftInstance(), tickData); } if (!keepTicking) { ticks.remove(type);