diff --git a/common/cpw/mods/fml/common/modloader/BaseModTicker.java b/common/cpw/mods/fml/common/modloader/BaseModTicker.java index 941c52c1b6..f7cab0c64b 100644 --- a/common/cpw/mods/fml/common/modloader/BaseModTicker.java +++ b/common/cpw/mods/fml/common/modloader/BaseModTicker.java @@ -29,6 +29,7 @@ public class BaseModTicker implements ITickHandler private BaseMod mod; private EnumSet ticks; + private boolean clockTickTrigger; BaseModTicker(BaseMod mod) @@ -56,6 +57,15 @@ public class BaseModTicker implements ITickHandler private void tickBaseMod(EnumSet types, boolean end, Object... tickData) { + if (end && types.contains(TickType.GAME) && ticks.contains(TickType.GAME)) + { + clockTickTrigger = true; + } + if (end && clockTickTrigger && (types.contains(TickType.RENDER) || FMLCommonHandler.instance().getSide().isServer())) + { + types.add(TickType.GAME); + types.remove(TickType.RENDER); + } for (TickType type : types) { if (!ticks.contains(type)) diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java b/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java index c785946fc4..99802f993e 100644 --- a/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java +++ b/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java @@ -35,7 +35,7 @@ public class ModLoaderHelper BaseModTicker ticker = mlmc.getTickHandler(); EnumSet ticks = ticker.ticks(); // If we're enabled and we don't want clock ticks we get render ticks - if (enable && !useClock && FMLCommonHandler.instance().getSide().isClient()) { + if (enable) { ticks.add(TickType.RENDER); } else { ticks.remove(TickType.RENDER);