diff options
| author | md_5 <git@md-5.net> | 2017-05-16 21:22:07 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2017-05-16 21:22:07 +1000 |
| commit | 45102fcf284d3c713d3f161123e0771396475b21 (patch) | |
| tree | 53efb9a181964dfc5aa6482ec1bfa803db310c31 /src | |
| parent | c4102405677265a3369ea42b20c9061b858e4f59 (diff) | |
| download | craftbukkit-45102fcf284d3c713d3f161123e0771396475b21.tar craftbukkit-45102fcf284d3c713d3f161123e0771396475b21.tar.gz craftbukkit-45102fcf284d3c713d3f161123e0771396475b21.tar.lz craftbukkit-45102fcf284d3c713d3f161123e0771396475b21.tar.xz craftbukkit-45102fcf284d3c713d3f161123e0771396475b21.zip | |
Misc advancement / recipe reload fixes including SPIGOT-3240
Diffstat (limited to 'src')
3 files changed, 2 insertions, 6 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 28725451..fc92b912 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -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; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapedRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapedRecipe.java index fd3aa7c0..26e94558 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapedRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapedRecipe.java @@ -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; } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java index 93719c50..7ba9502a 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java @@ -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; } |