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

51 lines
2.3 KiB
Diff
Raw Normal View History

2021-11-30 21:27:27 +01:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake <jake.m.potrebic@gmail.com>
Date: Tue, 30 Nov 2021 12:01:56 -0800
2021-12-13 04:59:43 +01:00
Subject: [PATCH] Fix removing recipes from RecipeIterator
2021-11-30 21:27:27 +01:00
== AT ==
public net.minecraft.world.item.crafting.RecipeManager byName
2021-11-30 21:27:27 +01:00
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java b/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java
index 65b12eaab871019def074bf17257772ff7f09806..692d9abd715988c96934888b492b93efa64ecce4 100644
2021-11-30 21:27:27 +01:00
--- a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java
@@ -13,6 +13,7 @@ import org.bukkit.inventory.Recipe;
2021-11-30 21:27:27 +01:00
public class RecipeIterator implements Iterator<Recipe> {
private final Iterator<Map.Entry<RecipeType<?>, Object2ObjectLinkedOpenHashMap<ResourceLocation, RecipeHolder<?>>>> recipes;
private Iterator<RecipeHolder<?>> current;
2021-11-30 21:27:27 +01:00
+ private Recipe currentRecipe; // Paper - fix removing recipes
public RecipeIterator() {
this.recipes = MinecraftServer.getServer().getRecipeManager().recipes.entrySet().iterator();
@@ -36,15 +37,27 @@ public class RecipeIterator implements Iterator<Recipe> {
2021-11-30 21:27:27 +01:00
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
public void remove() {
Preconditions.checkState(this.current != null, "next() not yet called");
+
2021-11-30 21:27:27 +01:00
+ // 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();
}
}