2024-06-15 21:49:08 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jake <jake.m.potrebic@gmail.com>
|
|
|
|
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
|
2024-10-25 21:47:52 +02:00
|
|
|
index 4e0f7564f04d5d566660a2623fb1b325e3b4e67c..ca0c82fdd7bd1c2055e84253d90b17857c51b771 100644
|
2024-06-15 21:49:08 +02:00
|
|
|
--- 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<Recipe> {
|
|
|
|
private final Iterator<Map.Entry<RecipeType<?>, RecipeHolder<?>>> recipes;
|
|
|
|
+ private Recipe currentRecipe; // Paper - fix removing recipes from RecipeIterator
|
|
|
|
|
|
|
|
public RecipeIterator() {
|
2024-10-24 17:16:31 +02:00
|
|
|
this.recipes = MinecraftServer.getServer().getRecipeManager().recipes.byType.entries().iterator();
|
2024-10-25 21:47:52 +02:00
|
|
|
@@ -21,11 +22,17 @@ public class RecipeIterator implements Iterator<Recipe> {
|
2024-06-15 21:49:08 +02:00
|
|
|
|
|
|
|
@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
|
2024-10-25 21:47:52 +02:00
|
|
|
+ if (true) throw new UnsupportedOperationException();
|
2024-06-15 21:49:08 +02:00
|
|
|
+ // Paper end - fix removing recipes from RecipeIterator
|
|
|
|
this.recipes.remove();
|
|
|
|
}
|
|
|
|
}
|