Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 02:25:28 +01:00
Code Issues Projects Releases Wiki Activity

Fix fix recipe iterator patch

Browse Source
This commit is contained in:
Jake Potrebic 2024-10-31 19:34:10 -07:00
parent 52a05907c7
commit 5c0930dfad
No known key found for this signature in database
GPG Key ID: ECE0B3C133C016C5
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0969-Fix-removing-recipes-from-RecipeIterator.patch
View File

@ -4,36 +4,34 @@ Date: Sat, 15 Jun 2024 18:50:18 +0100
Subject: [PATCH] Fix removing recipes from RecipeIterator Subject: [PATCH] Fix removing recipes from RecipeIterator
== AT == == AT ==
public net.minecraft.world.item.crafting.RecipeManager byName public net.minecraft.world.item.crafting.RecipeMap byKey
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java b/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java b/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java
index 4e0f7564f04d5d566660a2623fb1b325e3b4e67c..ca0c82fdd7bd1c2055e84253d90b17857c51b771 100644 index 4e0f7564f04d5d566660a2623fb1b325e3b4e67c..c0433e054e64c329dff670c8f7ca21c4a4133c6f 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java --- a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java
+++ b/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; @@ -9,6 +9,7 @@ import org.bukkit.inventory.Recipe;
public class RecipeIterator implements Iterator<Recipe> { public class RecipeIterator implements Iterator<Recipe> {
private final Iterator<Map.Entry<RecipeType<?>, RecipeHolder<?>>> recipes; private final Iterator<Map.Entry<RecipeType<?>, RecipeHolder<?>>> recipes;
+ private Recipe currentRecipe; // Paper - fix removing recipes from RecipeIterator + private RecipeHolder<?> currentRecipe; // Paper - fix removing recipes from RecipeIterator
public RecipeIterator() { public RecipeIterator() {
this.recipes = MinecraftServer.getServer().getRecipeManager().recipes.byType.entries().iterator(); this.recipes = MinecraftServer.getServer().getRecipeManager().recipes.byType.entries().iterator();
@@ -21,11 +22,17 @@ public class RecipeIterator implements Iterator<Recipe> { @@ -21,11 +22,15 @@ public class RecipeIterator implements Iterator<Recipe> {
@Override @Override
public Recipe next() { public Recipe next() {
- return this.recipes.next().getValue().toBukkitRecipe(); - return this.recipes.next().getValue().toBukkitRecipe();
+ // Paper start - fix removing recipes from RecipeIterator + // Paper start - fix removing recipes from RecipeIterator
+ this.currentRecipe = this.recipes.next().getValue().toBukkitRecipe(); + this.currentRecipe = this.recipes.next().getValue();
+ return this.currentRecipe; + return this.currentRecipe.toBukkitRecipe();
+ // Paper end - fix removing recipes from RecipeIterator + // Paper end - fix removing recipes from RecipeIterator
} }
@Override @Override
public void remove() { public void remove() {
+ // Paper start - fix removing recipes from RecipeIterator + MinecraftServer.getServer().getRecipeManager().recipes.byKey.remove(this.currentRecipe.id()); // Paper - fix removing recipes from RecipeIterator
+ if (true) throw new UnsupportedOperationException();
+ // Paper end - fix removing recipes from RecipeIterator
this.recipes.remove(); this.recipes.remove();
} }
} }