From 134299b4132b24e3bbbfc46d7c443d42fb005d6c Mon Sep 17 00:00:00 2001
From: Christian Weeks <cpw@weeksfamily.ca>
Date: Thu, 24 May 2012 23:18:04 -0400
Subject: [PATCH] Fix up two stupid overwrites in my mergeup from lex

---
 client/net/minecraft/src/BaseMod.java   | 4 ++--
 client/net/minecraft/src/ModLoader.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/net/minecraft/src/BaseMod.java b/client/net/minecraft/src/BaseMod.java
index b4f4dd3e42..09641e9b16 100644
--- a/client/net/minecraft/src/BaseMod.java
+++ b/client/net/minecraft/src/BaseMod.java
@@ -38,9 +38,9 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
     {
         Minecraft mc = (Minecraft) minecraftInstance;
         // World and render ticks
-        if ((tickEnd && tick==TickType.WORLD) || (!tickEnd && tick==TickType.RENDER)) {
+        if ((tickEnd && tick==TickType.WORLD) || (tickEnd && tick==TickType.RENDER)) {
             return onTickInGame((Float) data[0], mc);
-        } else if (((tickEnd && tick==TickType.WORLDGUI) || (!tickEnd && tick==TickType.GUI))) {
+        } else if (((tickEnd && tick==TickType.WORLDGUI) || (tickEnd && tick==TickType.GUI))) {
             return onTickInGUI((Float) data[0], mc, (GuiScreen)data[1]);
         }
         return true;
diff --git a/client/net/minecraft/src/ModLoader.java b/client/net/minecraft/src/ModLoader.java
index 4b099a3304..1ac82fecbb 100644
--- a/client/net/minecraft/src/ModLoader.java
+++ b/client/net/minecraft/src/ModLoader.java
@@ -659,7 +659,7 @@ public class ModLoader
     @Deprecated
     public static boolean renderBlockIsItemFull3D(int modelID)
     {
-        return false;
+        return FMLClientHandler.instance().renderItemAsFull3DBlock(modelID);
     }
 
     @Deprecated