Fix for in game tick running when it shouldn't. Fixed some tabbing issue in crazy's PR.
This commit is contained in:
parent
5997bd3b87
commit
779b3298bd
|
@ -301,14 +301,14 @@ public class FMLClientHandler implements IFMLSidedHandler
|
|||
|
||||
public void onRenderTickStart(float partialTickTime)
|
||||
{
|
||||
FMLCommonHandler.instance().tickStart(TickType.RENDER, partialTickTime);
|
||||
FMLCommonHandler.instance().tickStart(TickType.GUI, partialTickTime, client.field_6313_p);
|
||||
FMLCommonHandler.instance().tickStart(TickType.RENDER, partialTickTime);
|
||||
FMLCommonHandler.instance().tickStart(TickType.GUI, partialTickTime, client.field_6313_p);
|
||||
}
|
||||
|
||||
public void onRenderTickEnd(float partialTickTime)
|
||||
{
|
||||
FMLCommonHandler.instance().tickEnd(TickType.RENDER, partialTickTime);
|
||||
FMLCommonHandler.instance().tickEnd(TickType.GUI, partialTickTime, client.field_6313_p);
|
||||
FMLCommonHandler.instance().tickEnd(TickType.RENDER, partialTickTime);
|
||||
FMLCommonHandler.instance().tickEnd(TickType.GUI, partialTickTime, client.field_6313_p);
|
||||
}
|
||||
/**
|
||||
* Get the server instance
|
||||
|
|
|
@ -42,12 +42,13 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
|
|||
public final boolean doTickInGame(TickType tick, boolean tickEnd, Object minecraftInstance, Object... data)
|
||||
{
|
||||
Minecraft mc = (Minecraft) minecraftInstance;
|
||||
boolean hasWorld = mc.field_6324_e != null;
|
||||
// World and render ticks
|
||||
if ((tickEnd && tick==TickType.WORLD) || (tickEnd && tick==TickType.RENDER)) {
|
||||
if (((tickEnd && tick==TickType.WORLD) || (tickEnd && tick==TickType.RENDER)) && hasWorld) {
|
||||
return onTickInGame((Float) data[0], mc);
|
||||
} else if (((tickEnd && tick==TickType.WORLDGUI) || (tickEnd && tick==TickType.GUI))) {
|
||||
return onTickInGUI((Float) data[0], mc, (GuiScreen)data[1]);
|
||||
} else if (tick == TickType.WORLDLOADTICK) {
|
||||
} else if (tick == TickType.WORLDLOADTICK && hasWorld) {
|
||||
return onTickInGame(0.0f, mc);
|
||||
} else if (tick == TickType.GUILOADTICK) {
|
||||
return onTickInGUI(0.0f, mc, mc.field_6313_p);
|
||||
|
|
Loading…
Reference in New Issue