Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9301)

2023-06-12 16:51:45 -07:00
parent b835c02322
commit aa5e9d1d49
61 changed files with 322 additions and 419 deletions
--- a/patches/server/Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/Fix-removing-recipes-from-RecipeIterator.patch
@@ -37,10 +37,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
     }
 
     @Override
-@@ -0,0 +0,0 @@ public class RecipeIterator implements Iterator<Recipe> {
-             throw new IllegalStateException("next() not yet called");
-         }
- 
+     public void remove() {
+         Preconditions.checkState(this.current != null, "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()));