Merge pull request #2002 from ganymedes01/master

Disallow conflicting furnace recipes
This commit is contained in:
LexManos 2015-09-09 11:23:08 -07:00
commit fb7b47adb4
1 changed files with 9 additions and 1 deletions

View File

@ -1,6 +1,14 @@
--- ../src-base/minecraft/net/minecraft/item/crafting/FurnaceRecipes.java
+++ ../src-work/minecraft/net/minecraft/item/crafting/FurnaceRecipes.java
@@ -113,6 +113,9 @@
@@ -78,6 +78,7 @@
public void func_151394_a(ItemStack p_151394_1_, ItemStack p_151394_2_, float p_151394_3_)
{
+ if (func_151395_a(p_151394_1_) != null) { net.minecraftforge.fml.common.FMLLog.info("Ignored smelting recipe with conflicting input: " + p_151394_1_ + " = " + p_151394_2_); return; }
this.field_77604_b.put(p_151394_1_, p_151394_2_);
this.field_77605_c.put(p_151394_2_, Float.valueOf(p_151394_3_));
}
@@ -113,6 +114,9 @@
public float func_151398_b(ItemStack p_151398_1_)
{