SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Misc advancement / recipe reload fixes including SPIGOT-3240

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@@ -1077,10 +1077,6 @@ public final class CraftServer implements Server {
@Override
public void resetRecipes() {
// See SPIGOT-3240
if (true) {
return;
}
CraftingManager.recipes = new RegistryMaterials();
CraftingManager.init();
RecipesFurnace.getInstance().recipes = new RecipesFurnace().recipes;

2
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapedRecipe.java
View File

@@ -21,7 +21,7 @@ public class CraftShapedRecipe extends ShapedRecipe implements CraftRecipe {
}
public CraftShapedRecipe(ItemStack result, ShapedRecipes recipe) {
this(CraftNamespacedKey.fromMinecraft(CraftingManager.recipes.b(recipe)), result);
this(CraftNamespacedKey.fromMinecraft(recipe.key), result);
this.recipe = recipe;
}

2
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java
View File

@@ -21,7 +21,7 @@ public class CraftShapelessRecipe extends ShapelessRecipe implements CraftRecipe
}
public CraftShapelessRecipe(ItemStack result, ShapelessRecipes recipe) {
this(CraftNamespacedKey.fromMinecraft(recipe.key != null ? recipe.key : CraftingManager.recipes.b(recipe)), result);
this(CraftNamespacedKey.fromMinecraft(recipe.key), result);
this.recipe = recipe;
}