upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 16:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

FFS let this fix that bloody ticking mess that is ML compatibility.

Browse Source
This commit is contained in:
Christian committed 2012-07-03 23:03:51 -04:00
1 parent ba46389a87
commit a4ce90a918
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
common/cpw/mods/fml/common/modloader/BaseModTicker.java
+4 -4
View File
@@ -60,7 +60,7 @@ public class BaseModTicker implements ITickHandler
private void tickBaseMod(EnumSet<TickType> 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);