Updated Upstream (CraftBukkit) (#7105)

patches/server/Fix-removing-recipes-from-RecipeIterator.patch

@@ -1,21 +1,9 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jake Potrebic <jake.m.potrebic@gmail.com>
 Date: Tue, 30 Nov 2021 12:01:56 -0800
-Subject: [PATCH] Fix removing recipes
+Subject: [PATCH] Fix removing recipes from RecipeIterator
 
 
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit c2e0bbda4ee13ec92c603a7bfe9bd8e5575a2993
+Subproject commit dad851710202aeda815ff91c595de68f99e45f2c