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

Fix for in game tick running when it shouldn't. Fixed some tabbing issue in crazy's PR.

Browse Source
This commit is contained in:
LexManos committed 2012-06-06 08:01:54 -07:00
1 parent 5997bd3b87
commit 779b3298bd
2 files changed
+7 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

fml/client/net/minecraft/src/BaseMod.java
+3 -2
View File
@@ -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);