diff --git a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java index ca9d0bb82..b354e7535 100755 --- a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java @@ -121,7 +121,8 @@ public class MinecraftForgeClient public static IItemRenderer getItemRenderer(ItemStack item, ItemRenderType type) { IItemRenderer renderer = customItemRenderers[item.itemID]; - if (renderer != null && renderer.handleRenderType(item, type)) { + if (renderer != null && renderer.handleRenderType(item, type)) + { return customItemRenderers[item.itemID]; } return null; @@ -149,7 +150,7 @@ public class MinecraftForgeClient * If they do not match (such is the case in different versionf of MC) it exits the process with a error * * @param version The version to find, usually "Minecraft Minecraft 1.2.3" - * @param message The error message to display int eh crash log + * @param message The error message to display in the crash log */ public static void checkMinecraftVersion(String version, String message) { diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index fd0e9026f..3dfc3fcc1 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -1006,6 +1006,24 @@ public class MinecraftForge ForgeHooks.arrowLooseHandlers.add(handler); } + private static int isClient = -1; + public static boolean isClient() + { + if (isClient == -1) + { + try + { + Class.forName("net.minecraft.client.Minecraft", false, MinecraftForge.class.getClassLoader()); + isClient = 1; + } + catch (ClassNotFoundException e) + { + isClient = 0; + } + } + return isClient == 1; + } + static { addDungeonMob("Skeleton", 1.0f); diff --git a/forge/forge_common/net/minecraft/src/forge/packets/PacketEntitySpawn.java b/forge/forge_common/net/minecraft/src/forge/packets/PacketEntitySpawn.java index efab83db4..8d6ed7e71 100644 --- a/forge/forge_common/net/minecraft/src/forge/packets/PacketEntitySpawn.java +++ b/forge/forge_common/net/minecraft/src/forge/packets/PacketEntitySpawn.java @@ -94,7 +94,7 @@ public class PacketEntitySpawn extends ForgePacket { speedX = data.readShort(); speedY = data.readShort(); - speedX = data.readShort(); + speedZ = data.readShort(); } } @Override