summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/RecipesFurnace.java
diff options
context:
space:
mode:
authorNate Mortensen <nate.richard.mortensen@gmail.com>2014-03-20 22:26:30 -0600
committerEvilSeph <evilseph@gmail.com>2014-03-21 23:56:34 -0400
commit385ace970ee7b7912419d601b8a0867c4c2794df (patch)
tree2549da069930b488940f8a99833c396ffc7e36d1 /src/main/java/net/minecraft/server/RecipesFurnace.java
parentafb3511a4a5a63007217f2dbbbbc753f3bee0aed (diff)
downloadcraftbukkit-385ace970ee7b7912419d601b8a0867c4c2794df.tar
craftbukkit-385ace970ee7b7912419d601b8a0867c4c2794df.tar.gz
craftbukkit-385ace970ee7b7912419d601b8a0867c4c2794df.tar.lz
craftbukkit-385ace970ee7b7912419d601b8a0867c4c2794df.tar.xz
craftbukkit-385ace970ee7b7912419d601b8a0867c4c2794df.zip
Update CraftBukkit to Minecraft 1.7.5
Diffstat (limited to 'src/main/java/net/minecraft/server/RecipesFurnace.java')
-rw-r--r--src/main/java/net/minecraft/server/RecipesFurnace.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/RecipesFurnace.java b/src/main/java/net/minecraft/server/RecipesFurnace.java
index bf6ddb4d..c474d548 100644
--- a/src/main/java/net/minecraft/server/RecipesFurnace.java
+++ b/src/main/java/net/minecraft/server/RecipesFurnace.java
@@ -10,7 +10,7 @@ public class RecipesFurnace {
private static final RecipesFurnace a = new RecipesFurnace();
public Map recipes = new HashMap(); // CraftBukkit - private -> public
private Map c = new HashMap();
- public Map customRecipes = new HashMap(); // CraftBukkit
+ public Map customRecipes = new HashMap(); // CraftBukkit - add field
public static RecipesFurnace getInstance() {
return a;
@@ -63,14 +63,14 @@ public class RecipesFurnace {
this.c.put(itemstack1, Float.valueOf(f));
}
- // CraftBukkit start
+ // CraftBukkit start - add method
public void registerRecipe(ItemStack itemstack, ItemStack itemstack1) {
this.customRecipes.put(itemstack, itemstack1);
}
// CraftBukkit end
public ItemStack getResult(ItemStack itemstack) {
- // CraftBukkit start
+ // CraftBukkit start - initialize to customRecipes
boolean vanilla = false;
Iterator iterator = this.customRecipes.entrySet().iterator();
// CraftBukkit end
@@ -79,7 +79,7 @@ public class RecipesFurnace {
do {
if (!iterator.hasNext()) {
- // CraftBukkit start
+ // CraftBukkit start - fall back to vanilla recipes
if (!vanilla && recipes.size() != 0) {
iterator = this.recipes.entrySet().iterator();
vanilla = true;