From fdd80dad80295903cd569f2a63c15b3f29fcd338 Mon Sep 17 00:00:00 2001
From: Christian Weeks <cpw@weeksfamily.ca>
Date: Sat, 12 May 2012 01:03:36 -0400
Subject: [PATCH] Tick only when there's a world

---
 .../cpw/mods/fml/client/FMLClientHandler.java | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/fml/client/cpw/mods/fml/client/FMLClientHandler.java b/fml/client/cpw/mods/fml/client/FMLClientHandler.java
index c4d32bdac9..f4c4b146cc 100644
--- a/fml/client/cpw/mods/fml/client/FMLClientHandler.java
+++ b/fml/client/cpw/mods/fml/client/FMLClientHandler.java
@@ -194,9 +194,11 @@ public class FMLClientHandler implements IFMLSidedHandler
      */
     public void onPreWorldTick()
     {
-        FMLCommonHandler.instance().worldTickStart();
-        if (client.field_6313_p!=null && client.field_6324_e!=null) {
-            FMLCommonHandler.instance().tickStart(TickType.WORLDGUI, 0.0f, client.field_6313_p);
+        if (client.field_6324_e != null) {
+            FMLCommonHandler.instance().worldTickStart();
+            if (client.field_6313_p !=null) {
+                FMLCommonHandler.instance().tickStart(TickType.WORLDGUI, 0.0f, client.field_6313_p);
+            }
         }
     }
 
@@ -205,25 +207,30 @@ public class FMLClientHandler implements IFMLSidedHandler
      */
     public void onPostWorldTick()
     {
-        FMLCommonHandler.instance().worldTickEnd();
-        if (client.field_6313_p!=null && client.field_6324_e!=null) {
-            FMLCommonHandler.instance().tickEnd(TickType.WORLDGUI, 0.0f, client.field_6313_p);
+        if (client.field_6324_e != null) {
+            FMLCommonHandler.instance().worldTickEnd();
+            if (client.field_6313_p!=null) {
+                FMLCommonHandler.instance().tickEnd(TickType.WORLDGUI, 0.0f, client.field_6313_p);
         }
     }
 
     public void onRenderTickStart(float partialTickTime)
     {
+        if (client.field_6324_e != null) {
         FMLCommonHandler.instance().tickStart(TickType.RENDER, partialTickTime);
-        if (client.field_6313_p!=null && client.field_6324_e!=null) {
-            FMLCommonHandler.instance().tickStart(TickType.GUI, partialTickTime, client.field_6313_p);
+            if (client.field_6324_e!=null) {
+                FMLCommonHandler.instance().tickStart(TickType.GUI, partialTickTime, client.field_6313_p);
+            }
         }
     }
     
     public void onRenderTickEnd(float partialTickTime)
     {
-        FMLCommonHandler.instance().tickEnd(TickType.RENDER, partialTickTime);
-        if (client.field_6313_p!=null && client.field_6324_e!=null) {
-            FMLCommonHandler.instance().tickEnd(TickType.GUI, partialTickTime, client.field_6313_p);
+        if (client.field_6324_e != null) {
+            FMLCommonHandler.instance().tickEnd(TickType.RENDER, partialTickTime);
+            if (client.field_6324_e!=null) {
+                FMLCommonHandler.instance().tickEnd(TickType.GUI, partialTickTime, client.field_6313_p);
+            }
         }
     }
     /**