From 438570417270cfd11004b59ff05abb227b6809f8 Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Sun, 17 Jun 2012 18:49:19 -0400
Subject: [PATCH] Remove WorldLoad tick from modloader mods- too early. *sigh*

---
 fml/client/net/minecraft/src/BaseMod.java                | 4 ----
 fml/common/cpw/mods/fml/common/TickType.java             | 6 +++---
 .../cpw/mods/fml/common/modloader/ModLoaderHelper.java   | 9 +--------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/fml/client/net/minecraft/src/BaseMod.java b/fml/client/net/minecraft/src/BaseMod.java
index f26d1620b1..0c98cfbc15 100644
--- a/fml/client/net/minecraft/src/BaseMod.java
+++ b/fml/client/net/minecraft/src/BaseMod.java
@@ -48,10 +48,6 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
             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.WORLDLOAD && hasWorld) {
-            return onTickInGame(0.0f, mc);
-        } else if (tick == TickType.GUILOAD) {
-            return onTickInGUI(0.0f, mc, mc.field_6313_p);
         }
         return true;
     }
diff --git a/fml/common/cpw/mods/fml/common/TickType.java b/fml/common/cpw/mods/fml/common/TickType.java
index 15b2308651..ae659db2cd 100644
--- a/fml/common/cpw/mods/fml/common/TickType.java
+++ b/fml/common/cpw/mods/fml/common/TickType.java
@@ -67,11 +67,11 @@ public enum TickType {
      */
     public EnumSet<TickType> partnerTicks()
     {
-        if (this==GAME) return EnumSet.of(RENDER,WORLDLOAD);
-        if (this==RENDER) return EnumSet.of(GAME, WORLDLOAD);
+        if (this==GAME) return EnumSet.of(RENDER);
+        if (this==RENDER) return EnumSet.of(GAME);
         if (this==GUI) return EnumSet.of(WORLDGUI, GUILOAD);
         if (this==WORLDGUI) return EnumSet.of(GUI, GUILOAD);
-        if (this==WORLDLOAD) return EnumSet.of(GAME, RENDER);
+        if (this==WORLDLOAD) return EnumSet.noneOf(TickType.class);
         if (this==GUILOAD) return EnumSet.of(GUI, WORLDGUI);
         return null;
     }
diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java
index 99802f993e..502137ba4e 100644
--- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java
+++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java
@@ -34,7 +34,7 @@ public class ModLoaderHelper
         ModLoaderModContainer mlmc = findOrBuildModContainer(mod);
         BaseModTicker ticker = mlmc.getTickHandler();
         EnumSet<TickType> ticks = ticker.ticks();
-        // If we're enabled and we don't want clock ticks we get render ticks
+        // If we're enabled we get render ticks
         if (enable) {
             ticks.add(TickType.RENDER);
         } else {
@@ -46,10 +46,6 @@ public class ModLoaderHelper
         } else {
             ticks.remove(TickType.GAME);
         }
-        
-        if (enable) {
-            ticks.add(TickType.WORLDLOAD);
-        }
     }
 
     public static void updateGUITicks(BaseMod mod, boolean enable, boolean useClock)
@@ -68,9 +64,6 @@ public class ModLoaderHelper
         } else {
             ticks.remove(TickType.WORLDGUI);
         }
-        if (enable) {
-            ticks.add(TickType.GUILOAD);
-        }
     }
 
     /**