Merge remote-tracking branch 'origin/master'

This commit is contained in:
LexManos 2012-03-09 18:55:13 -08:00
commit b56e414b98

View file

@ -780,13 +780,9 @@ public class MinecraftForge
* @return An ItemStack that can be used to place the cart.
*/
public static ItemStack getItemForCart(EntityMinecart cart)
{
if (cart.getClass() == EntityMinecart.class)
{
return getItemForCart(cart.getClass(), cart.getMinecartType());
}
return getItemForCart(cart.getClass(), 0);
}
/**
* The function will return the cart class for a given item.