SPIGOT-5097: Bukkit.clearRecipes() no longer working

This commit is contained in:
md_5 2019-06-22 18:24:23 +10:00
parent 38fa220f69
commit 9af900778d
2 changed files with 6 additions and 10 deletions

View File

@ -90,22 +90,18 @@
}).filter(Objects::nonNull).findFirst(); }).filter(Objects::nonNull).findFirst();
} }
@@ -118,4 +138,18 @@ @@ -118,4 +138,14 @@
return new JsonSyntaxException("Invalid or unsupported recipe type '" + s + "'"); return new JsonSyntaxException("Invalid or unsupported recipe type '" + s + "'");
})).a(minecraftkey, jsonobject); })).a(minecraftkey, jsonobject);
} }
+ +
+ // CraftBukkit start + // CraftBukkit start
+ public static void initializeRecipeMap(Map<Recipes<?>, Object2ObjectLinkedOpenHashMap<MinecraftKey, IRecipe<?>>> map) { + public void clearRecipes() {
+ map.clear(); + this.recipes = Maps.newHashMap();
+ Iterator iterator = IRegistry.RECIPE_TYPE.iterator();
+ +
+ while (iterator.hasNext()) { + for (Recipes<?> recipeType : IRegistry.RECIPE_TYPE) {
+ Recipes<?> recipes = (Recipes) iterator.next(); + this.recipes.put(recipeType, new Object2ObjectLinkedOpenHashMap<>());
+
+ map.put(recipes, new Object2ObjectLinkedOpenHashMap<>()); // CraftBukkit
+ } + }
+
+ } + }
+ // CraftBukkit end + // CraftBukkit end
} }

View File

@ -1100,7 +1100,7 @@ public final class CraftServer implements Server {
@Override @Override
public void clearRecipes() { public void clearRecipes() {
CraftingManager.initializeRecipeMap(console.getCraftingManager().recipes); console.getCraftingManager().clearRecipes();
} }
@Override @Override