From 0d72808107e8fab501a6f25ec4b55be1ada11a92 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sun, 12 Dec 2021 19:59:43 -0800 Subject: [PATCH] Updated Upstream (CraftBukkit) (#7105) --- ...Fix-removing-recipes-from-RecipeIterator.patch} | 14 +------------- work/CraftBukkit | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) rename patches/server/{Fix-removing-recipes.patch => Fix-removing-recipes-from-RecipeIterator.patch} (72%) diff --git a/patches/server/Fix-removing-recipes.patch b/patches/server/Fix-removing-recipes-from-RecipeIterator.patch similarity index 72% rename from patches/server/Fix-removing-recipes.patch rename to patches/server/Fix-removing-recipes-from-RecipeIterator.patch index 2aec163dbe..ecd428dc77 100644 --- a/patches/server/Fix-removing-recipes.patch +++ b/patches/server/Fix-removing-recipes-from-RecipeIterator.patch @@ -1,21 +1,9 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Tue, 30 Nov 2021 12:01:56 -0800 -Subject: [PATCH] Fix removing recipes +Subject: [PATCH] Fix removing recipes from RecipeIterator -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java -+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -0,0 +0,0 @@ public final class CraftServer implements Server { - ResourceLocation mcKey = CraftNamespacedKey.toMinecraft(recipeKey); - for (Object2ObjectLinkedOpenHashMap> recipes : this.getServer().getRecipeManager().recipes.values()) { - if (recipes.remove(mcKey) != null) { -+ this.getServer().getRecipeManager().byName.remove(mcKey); // Paper - return true; - } - } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java b/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java diff --git a/work/CraftBukkit b/work/CraftBukkit index c2e0bbda4e..dad8517102 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit c2e0bbda4ee13ec92c603a7bfe9bd8e5575a2993 +Subproject commit dad851710202aeda815ff91c595de68f99e45f2c