Misc advancement / recipe reload fixes including SPIGOT-3240

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2017-05-16 21:22:07 +10:00
parent 4c88ea37ee
commit 5317a74e0a
8 changed files with 75 additions and 42 deletions

View File

@@ -1,6 +1,22 @@
--- a/net/minecraft/server/CraftingManager.java
+++ b/net/minecraft/server/CraftingManager.java
@@ -158,12 +158,14 @@
@@ -34,6 +34,7 @@
public static boolean init() {
try {
+ CraftingManager.c = 0; // Reset recipe ID count
a("armordye", new RecipeArmorDye());
a("bookcloning", new RecipeBookClone());
a("mapcloning", new RecipeMapClone());
@@ -147,6 +148,7 @@
if (CraftingManager.recipes.d(minecraftkey)) {
throw new IllegalStateException("Duplicate recipe ignored with ID " + minecraftkey);
} else {
+ irecipe.key = minecraftkey; // CraftBukkit
CraftingManager.recipes.a(CraftingManager.c++, minecraftkey, irecipe);
}
}
@@ -158,12 +160,14 @@
do {
if (!iterator.hasNext()) {
@@ -15,7 +31,7 @@
return irecipe.craftItem(inventorycrafting);
}
@@ -175,12 +177,14 @@
@@ -175,12 +179,14 @@
do {
if (!iterator.hasNext()) {
@@ -30,7 +46,7 @@
return irecipe;
}
@@ -210,7 +214,7 @@
@@ -210,7 +216,7 @@
}
public static int a(IRecipe irecipe) {