--- a/net/minecraft/server/CraftingManager.java
+++ b/net/minecraft/server/CraftingManager.java
@@ -96,12 +96,14 @@
 
         do {
             if (!iterator.hasNext()) {
+                iinventory.setCurrentRecipe(null); // CraftBukkit - Clear recipe when no recipe is found
                 return ItemStack.a;
             }
 
             irecipe = (IRecipe) iterator.next();
         } while (!irecipe.a(iinventory, world));
 
+        iinventory.setCurrentRecipe(irecipe); // CraftBukkit
         return irecipe.craftItem(iinventory);
     }
 
@@ -113,12 +115,14 @@
 
         do {
             if (!iterator.hasNext()) {
+                iinventory.setCurrentRecipe(null); // CraftBukkit - Clear recipe when no recipe is found
                 return null;
             }
 
             irecipe = (IRecipe) iterator.next();
         } while (!irecipe.a(iinventory, world));
 
+        iinventory.setCurrentRecipe(irecipe); // CraftBukkit
         return irecipe;
     }