OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-19 13:38:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

[Bleeding] Handle custom furnace recipes separately. Fixes BUKKIT-1657, BUKKIT-3846

Browse source 
Due to vanilla blanket comparing data values, and the unspecified
order of hashmap iterators, we need to run through custom recipes
first, and therefore separately, to ensure that they are actually
used. By not adding the custom results to the experience table, we do
not override the experience gains from vanilla smelting recipes.

By: t00thpick1 <t00thpick1dirko@gmail.com>
This commit is contained in:
CraftBukkit/Spigot 2013-12-20 18:44:13 -05:00
parent 815904c481
commit fda1280bce
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
View file

@ -961,11 +961,13 @@ public final class CraftServer implements Server {
public void clearRecipes() { public void clearRecipes() {
CraftingManager.getInstance().recipes.clear(); CraftingManager.getInstance().recipes.clear();
RecipesFurnace.getInstance().recipes.clear(); RecipesFurnace.getInstance().recipes.clear();
RecipesFurnace.getInstance().customRecipes.clear();
} }
public void resetRecipes() { public void resetRecipes() {
CraftingManager.getInstance().recipes = new CraftingManager().recipes; CraftingManager.getInstance().recipes = new CraftingManager().recipes;
RecipesFurnace.getInstance().recipes = new RecipesFurnace().recipes; RecipesFurnace.getInstance().recipes = new RecipesFurnace().recipes;
RecipesFurnace.getInstance().customRecipes.clear();
} }
public Map<String, String[]> getCommandAliases() { public Map<String, String[]> getCommandAliases() {

2
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftFurnaceRecipe.java
View file

@ -22,6 +22,6 @@ public class CraftFurnaceRecipe extends FurnaceRecipe implements CraftRecipe {
public void addToCraftingManager() { public void addToCraftingManager() {
ItemStack result = this.getResult(); ItemStack result = this.getResult();
ItemStack input = this.getInput(); ItemStack input = this.getInput();
RecipesFurnace.getInstance().a(CraftMagicNumbers.getItem(input.getTypeId()), CraftItemStack.asNMSCopy(result), 0.1f); RecipesFurnace.getInstance().registerRecipe(CraftItemStack.asNMSCopy(input), CraftItemStack.asNMSCopy(result));
} }
} }