From 43484eb3409469dc49665a7b55057921ac7dcb71 Mon Sep 17 00:00:00 2001 From: Aya <31237389+tal5@users.noreply.github.com> Date: Sat, 15 Jun 2024 20:49:08 +0100 Subject: [PATCH] Add back RecipeIterator fixes patch (#10887) --- ...removing-recipes-from-RecipeIterator.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 patches/server/1055-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/1055-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/1055-Fix-removing-recipes-from-RecipeIterator.patch new file mode 100644 index 0000000000..461c3eb854 --- /dev/null +++ b/patches/server/1055-Fix-removing-recipes-from-RecipeIterator.patch @@ -0,0 +1,41 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake +Date: Sat, 15 Jun 2024 18:50:18 +0100 +Subject: [PATCH] Fix removing recipes from RecipeIterator + +== AT == +public net.minecraft.world.item.crafting.RecipeManager byName + +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java b/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java +index 78a2afa981407de793ac940d6eb7315c5cd53b8f..33cd12d55786356dc89ab9d3872b2f7d266c3de2 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java +@@ -9,6 +9,7 @@ import org.bukkit.inventory.Recipe; + + public class RecipeIterator implements Iterator { + private final Iterator, RecipeHolder>> recipes; ++ private Recipe currentRecipe; // Paper - fix removing recipes from RecipeIterator + + public RecipeIterator() { + this.recipes = MinecraftServer.getServer().getRecipeManager().byType.entries().iterator(); +@@ -21,11 +22,19 @@ public class RecipeIterator implements Iterator { + + @Override + public Recipe next() { +- return this.recipes.next().getValue().toBukkitRecipe(); ++ // Paper start - fix removing recipes from RecipeIterator ++ this.currentRecipe = this.recipes.next().getValue().toBukkitRecipe(); ++ return this.currentRecipe; ++ // Paper end - fix removing recipes from RecipeIterator + } + + @Override + public void remove() { ++ // Paper start - fix removing recipes from RecipeIterator ++ if (this.currentRecipe instanceof org.bukkit.Keyed keyed) { ++ MinecraftServer.getServer().getRecipeManager().byName.remove(org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(keyed.getKey())); ++ } ++ // Paper end - fix removing recipes from RecipeIterator + this.recipes.remove(); + } + }