From bd9c2b75c75941ae9f54fae5c1dd6a8f5e0e8158 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <15055071+Machine-Maker@users.noreply.github.com>
Date: Tue, 30 Nov 2021 12:27:27 -0800
Subject: [PATCH] Fix removing recipes (#6965)

---
 build-data/paper.at                           |  3 +
 .../server/0815-Fix-removing-recipes.patch    | 61 +++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 patches/server/0815-Fix-removing-recipes.patch

diff --git a/build-data/paper.at b/build-data/paper.at
index 5fcbdc2590..0b90f95521 100644
--- a/build-data/paper.at
+++ b/build-data/paper.at
@@ -271,3 +271,6 @@ public net.minecraft.world.level.chunk.LevelChunkSection states
 
 # Player.setPlayerProfile API
 public-f net.minecraft.world.entity.player.Player gameProfile
+
+# Fix removing recipes
+public net.minecraft.world.item.crafting.RecipeManager byName
diff --git a/patches/server/0815-Fix-removing-recipes.patch b/patches/server/0815-Fix-removing-recipes.patch
new file mode 100644
index 0000000000..e2a279a4be
--- /dev/null
+++ b/patches/server/0815-Fix-removing-recipes.patch
@@ -0,0 +1,61 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake <jake.m.potrebic@gmail.com>
+Date: Tue, 30 Nov 2021 12:01:56 -0800
+Subject: [PATCH] Fix removing recipes
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+index 1d7d3dbf7f6857d9853112844b70692e92e9c89d..d938dc26886aa8a64c11db5e49fe5639bc27e1fb 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -1534,6 +1534,7 @@ public final class CraftServer implements Server {
+         ResourceLocation mcKey = CraftNamespacedKey.toMinecraft(recipeKey);
+         for (Object2ObjectLinkedOpenHashMap<ResourceLocation, net.minecraft.world.item.crafting.Recipe<?>> recipes : this.getServer().getRecipeManager().recipes.values()) {
+             if (recipes.remove(mcKey) != null) {
++                this.getServer().getRecipeManager().byName.remove(mcKey); // Paper
+                 return true;
+             }
+         }
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java b/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java
+index 24f336c89b548c5ba2a95372db0d7c83b5c4ec47..91895c639c33a1cafd2a35bab7b5fd83e558468d 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java
+@@ -11,6 +11,7 @@ import org.bukkit.inventory.Recipe;
+ public class RecipeIterator implements Iterator<Recipe> {
+     private final Iterator<Map.Entry<RecipeType<?>, Object2ObjectLinkedOpenHashMap<ResourceLocation, net.minecraft.world.item.crafting.Recipe<?>>>> recipes;
+     private Iterator<net.minecraft.world.item.crafting.Recipe<?>> current;
++    private Recipe currentRecipe; // Paper - fix removing recipes
+ 
+     public RecipeIterator() {
+         this.recipes = MinecraftServer.getServer().getRecipeManager().recipes.entrySet().iterator();
+@@ -34,10 +35,16 @@ public class RecipeIterator implements Iterator<Recipe> {
+     public Recipe next() {
+         if (this.current == null || !this.current.hasNext()) {
+             this.current = this.recipes.next().getValue().values().iterator();
+-            return this.next();
++            // Paper start - fix removing recipes
++            this.currentRecipe = this.next();
++            return this.currentRecipe;
++            // Paper end
+         }
+ 
+-        return this.current.next().toBukkitRecipe();
++        // Paper start - fix removing recipes
++        this.currentRecipe = this.current.next().toBukkitRecipe();
++        return this.currentRecipe;
++        // Paper end
+     }
+ 
+     @Override
+@@ -46,6 +53,11 @@ public class RecipeIterator implements Iterator<Recipe> {
+             throw new IllegalStateException("next() not yet called");
+         }
+ 
++        // Paper start - fix removing recipes
++        if (this.currentRecipe instanceof org.bukkit.Keyed keyed) {
++            MinecraftServer.getServer().getRecipeManager().byName.remove(org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(keyed.getKey()));
++        }
++        // Paper end
+         this.current.remove();
+     }
+ }