From c25ddf063a808e3adb749e22017661f403c5fb7e Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 17 Nov 2016 12:41:03 +1100 Subject: Update to Minecraft 1.11 --- nms-patches/CraftingManager.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'nms-patches/CraftingManager.patch') diff --git a/nms-patches/CraftingManager.patch b/nms-patches/CraftingManager.patch index d37e1c5c..1e5049d6 100644 --- a/nms-patches/CraftingManager.patch +++ b/nms-patches/CraftingManager.patch @@ -1,8 +1,8 @@ --- a/net/minecraft/server/CraftingManager.java +++ b/net/minecraft/server/CraftingManager.java -@@ -10,10 +10,16 @@ +@@ -9,10 +9,16 @@ + import java.util.Iterator; import java.util.List; - import javax.annotation.Nullable; +import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit + @@ -17,7 +17,7 @@ public static CraftingManager getInstance() { return CraftingManager.a; -@@ -178,7 +184,12 @@ +@@ -179,7 +185,12 @@ this.registerShapedRecipe(new ItemStack(Items.ARMOR_STAND, 1), new Object[] { "///", " / ", "/_/", Character.valueOf('/'), Items.STICK, Character.valueOf('_'), new ItemStack(Blocks.STONE_SLAB, 1, BlockDoubleStepAbstract.EnumStoneSlabVariant.STONE.a())}); this.registerShapedRecipe(new ItemStack(Blocks.END_ROD, 4), new Object[] { "/", "#", Character.valueOf('/'), Items.BLAZE_ROD, Character.valueOf('#'), Items.CHORUS_FRUIT_POPPED}); this.registerShapedRecipe(new ItemStack(Blocks.di, 1), new Object[] { "XXX", "XXX", "XXX", Character.valueOf('X'), new ItemStack(Items.DYE, 1, EnumColor.WHITE.getInvColorIndex())}); @@ -36,7 +36,7 @@ do { if (!iterator.hasNext()) { + inventorycrafting.currentRecipe = null; // CraftBukkit - Clear recipe when no recipe is found - return null; + return ItemStack.a; } irecipe = (IRecipe) iterator.next(); @@ -50,4 +50,4 @@ + // CraftBukkit end } - public ItemStack[] b(InventoryCrafting inventorycrafting, World world) { + public NonNullList b(InventoryCrafting inventorycrafting, World world) { -- cgit v1.2.3