diff options
Diffstat (limited to 'nms-patches/RecipesFurnace.patch')
| -rw-r--r-- | nms-patches/RecipesFurnace.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/nms-patches/RecipesFurnace.patch b/nms-patches/RecipesFurnace.patch index ae1f06f8..9c2f9bf8 100644 --- a/nms-patches/RecipesFurnace.patch +++ b/nms-patches/RecipesFurnace.patch @@ -1,11 +1,12 @@ --- a/net/minecraft/server/RecipesFurnace.java +++ b/net/minecraft/server/RecipesFurnace.java -@@ -10,7 +10,9 @@ +@@ -9,8 +9,10 @@ + public class RecipesFurnace { private static final RecipesFurnace a = new RecipesFurnace(); - public Map<ItemStack, ItemStack> recipes = Maps.newHashMap(); -- private Map<ItemStack, Float> c = Maps.newHashMap(); -+ private Map<ItemStack, Float> c = Maps.newHashMap(); // PAIL: rename +- public final Map<ItemStack, ItemStack> recipes = Maps.newHashMap(); ++ public Map<ItemStack, ItemStack> recipes = Maps.newHashMap(); + private final Map<ItemStack, Float> experience = Maps.newHashMap(); + public Map<ItemStack,ItemStack> customRecipes = Maps.newHashMap(); // CraftBukkit - add field + public Map<ItemStack,Float> customExperience = Maps.newHashMap(); // CraftBukkit - add field @@ -54,7 +55,7 @@ } public float b(ItemStack itemstack) { -- Iterator iterator = this.c.entrySet().iterator(); +- Iterator iterator = this.experience.entrySet().iterator(); + // CraftBukkit start - initialize to customRecipes + boolean vanilla = false; + Iterator<Entry<ItemStack, Float>> iterator = this.customExperience.entrySet().iterator(); @@ -66,8 +67,8 @@ if (!iterator.hasNext()) { - return 0.0F; + // CraftBukkit start - fall back to vanilla recipes -+ if (!vanilla && !this.c.isEmpty()) { -+ iterator = this.c.entrySet().iterator(); ++ if (!vanilla && !this.experience.isEmpty()) { ++ iterator = this.experience.entrySet().iterator(); + vanilla = true; + } else { + return 0.0F; |