From 45102fcf284d3c713d3f161123e0771396475b21 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 16 May 2017 21:22:07 +1000
Subject: Misc advancement / recipe reload fixes including SPIGOT-3240

---
 nms-patches/CraftingManager.patch | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'nms-patches/CraftingManager.patch')

diff --git a/nms-patches/CraftingManager.patch b/nms-patches/CraftingManager.patch
index d7f5e216..dff26072 100644
--- a/nms-patches/CraftingManager.patch
+++ b/nms-patches/CraftingManager.patch
@@ -1,6 +1,22 @@
 --- a/net/minecraft/server/CraftingManager.java
 +++ b/net/minecraft/server/CraftingManager.java
-@@ -158,12 +158,14 @@
+@@ -34,6 +34,7 @@
+ 
+     public static boolean init() {
+         try {
++            CraftingManager.c = 0; // Reset recipe ID count
+             a("armordye", new RecipeArmorDye());
+             a("bookcloning", new RecipeBookClone());
+             a("mapcloning", new RecipeMapClone());
+@@ -147,6 +148,7 @@
+         if (CraftingManager.recipes.d(minecraftkey)) {
+             throw new IllegalStateException("Duplicate recipe ignored with ID " + minecraftkey);
+         } else {
++            irecipe.key = minecraftkey; // CraftBukkit
+             CraftingManager.recipes.a(CraftingManager.c++, minecraftkey, irecipe);
+         }
+     }
+@@ -158,12 +160,14 @@
  
          do {
              if (!iterator.hasNext()) {
@@ -15,7 +31,7 @@
          return irecipe.craftItem(inventorycrafting);
      }
  
-@@ -175,12 +177,14 @@
+@@ -175,12 +179,14 @@
  
          do {
              if (!iterator.hasNext()) {
@@ -30,7 +46,7 @@
          return irecipe;
      }
  
-@@ -210,7 +214,7 @@
+@@ -210,7 +216,7 @@
      }
  
      public static int a(IRecipe irecipe) {
-- 
cgit v1.2.3