Merge remote-tracking branch 'origin/master'

This commit is contained in:
LexManos 2012-03-09 18:55:13 -08:00
commit b56e414b98
1 changed files with 1 additions and 5 deletions

View File

@ -781,11 +781,7 @@ public class MinecraftForge
*/
public static ItemStack getItemForCart(EntityMinecart cart)
{
if (cart.getClass() == EntityMinecart.class)
{
return getItemForCart(cart.getClass(), cart.getMinecartType());
}
return getItemForCart(cart.getClass(), 0);
return getItemForCart(cart.getClass(), cart.getMinecartType());
}
/**