mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update to Minecraft 1.12-pre6

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2017-05-30 21:25:59 +10:00
commit ea6ca4328a
35 changed files with 297 additions and 260 deletions
Download patch file Download diff file Expand all files Collapse all files

6
paper-server/nms-patches/RecipeRepair.patch
View file

@ -4,8 +4,8 @@
import com.google.common.collect.Lists;
import java.util.ArrayList;
-public class RecipeRepair extends IRecipe {
+public class RecipeRepair extends ShapelessRecipes { // CraftBukkit
-public class RecipeRepair implements IRecipe {
+public class RecipeRepair extends ShapelessRecipes implements IRecipe { // CraftBukkit - added extends
- public RecipeRepair() {}
+ // CraftBukkit start - Delegate to new parent class
@ -26,7 +26,7 @@
+ NonNullList<RecipeItemStack> ingredients = NonNullList.a();
+ ingredients.add(RecipeItemStack.a(new ItemStack[]{itemstack2.cloneItemStack()}));
+ ingredients.add(RecipeItemStack.a(new ItemStack[]{itemstack.cloneItemStack()}));
+ ShapelessRecipes recipe = new ShapelessRecipes(this.a, result.cloneItemStack(), ingredients);
+ ShapelessRecipes recipe = new ShapelessRecipes("", result.cloneItemStack(), ingredients);
+ recipe.key = new MinecraftKey("repairitem");
+ inventorycrafting.currentRecipe = recipe;
+ result = org.bukkit.craftbukkit.event.CraftEventFactory.callPreCraftEvent(inventorycrafting, result, inventorycrafting.container.getBukkitView(), true);