Merge remote-tracking branch 'origin/master'

This commit is contained in:
LexManos 2012-06-06 01:56:58 -07:00
commit 37191a3ac8
1 changed files with 6 additions and 6 deletions

View File

@ -939,11 +939,11 @@ public class MinecraftForge
public static Class<? extends EntityMinecart> getCartClassForItem(ItemStack item)
{
MinecartKey key = null;
for (ItemStack tmpKey : minecartForItem.keySet())
for (Map.Entry<ItemStack, MinecartKey> entry : minecartForItem.entrySet())
{
if (tmpKey.isItemEqual(item))
if (entry.getKey().isItemEqual(item))
{
key = minecartForItem.get(key);
key = entry.getValue();
break;
}
}
@ -964,11 +964,11 @@ public class MinecraftForge
public static int getCartTypeForItem(ItemStack item)
{
MinecartKey key = null;
for (ItemStack tmpKey : minecartForItem.keySet())
for (Map.Entry<ItemStack, MinecartKey> entry : minecartForItem.entrySet())
{
if (tmpKey.isItemEqual(item))
if (entry.getKey().isItemEqual(item))
{
key = minecartForItem.get(key);
key = entry.getValue();
break;
}
}