From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jake Date: Tue, 30 Nov 2021 12:01:56 -0800 Subject: [PATCH] Fix removing recipes from RecipeIterator 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 { private final Iterator, Object2ObjectLinkedOpenHashMap>>> recipes; private Iterator> 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 { 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 { 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(); } }