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 up two stupid overwrites in my mergeup from lex

Browse Source
This commit is contained in:
Christian Weeks committed 2012-05-24 23:18:04 -04:00
1 parent fe710a9245
commit d45134eb9a
2 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

fml/client/net/minecraft/src/BaseMod.java
+2 -2
View File
@@ -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;
fml/client/net/minecraft/src/ModLoader.java
+1 -1
View File
@@ -659,7 +659,7 @@ public class ModLoader
@Deprecated
public static boolean renderBlockIsItemFull3D(int modelID)
{
return false;
return FMLClientHandler.instance().renderItemAsFull3DBlock(modelID);
}
@Deprecated