Minecraft 1.9.4

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-05-10 21:47:39 +10:00
parent c9a6e9175c
commit d506c12c07
236 changed files with 1471 additions and 1822 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/RecipesFurnace.java
+++ b/net/minecraft/server/RecipesFurnace.java
@@ -9,7 +9,9 @@
@@ -10,7 +10,9 @@
private static final RecipesFurnace a = new RecipesFurnace();
public Map<ItemStack, ItemStack> recipes = Maps.newHashMap();
@@ -11,7 +11,7 @@
public static RecipesFurnace getInstance() {
return RecipesFurnace.a;
@@ -54,6 +56,12 @@
@@ -55,6 +57,12 @@
this.registerRecipe(Blocks.QUARTZ_ORE, new ItemStack(Items.QUARTZ), 0.2F);
}
@@ -24,9 +24,9 @@
public void registerRecipe(Block block, ItemStack itemstack, float f) {
this.a(Item.getItemOf(block), itemstack, f);
}
@@ -68,13 +76,23 @@
}
@@ -70,13 +78,23 @@
@Nullable
public ItemStack getResult(ItemStack itemstack) {
- Iterator iterator = this.recipes.entrySet().iterator();
+ // CraftBukkit start - initialize to customRecipes
@@ -50,7 +50,7 @@
}
entry = (Entry) iterator.next();
@@ -92,13 +110,23 @@
@@ -94,13 +112,23 @@
}
public float b(ItemStack itemstack) {